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)
commitfc146370e5407a48d5669232ef78d7c18dff2743
tree72a39486664dcf7364051fb01fac19e3e1bc1903
parent85b729ec9ec0ceba5dfda2dc853614cc181e63b9
parentc13d296672e1d180c0268ca8dededa535ca67c31
Merge commit 'c13d296672e1d180c0268ca8dededa535ca67c31' into develop-3.0