Merge commit 'c13d296672e1d180c0268ca8dededa535ca67c31' into develop-3.0
authoryangkai <yk@rock-chips.com>
Tue, 4 Sep 2012 06:56:57 +0000 (14:56 +0800)
committeryangkai <yk@rock-chips.com>
Tue, 4 Sep 2012 06:56:57 +0000 (14:56 +0800)

Trivial merge