Merge commit 'c3bf6e05eb93a700ff8f72d596a9bbcb89196184' into develop-3.0
authoryangkai <yk@rock-chips.com>
Tue, 11 Sep 2012 07:35:05 +0000 (15:35 +0800)
committeryangkai <yk@rock-chips.com>
Tue, 11 Sep 2012 07:35:05 +0000 (15:35 +0800)

Trivial merge