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)
commit7f6363341431b2a57e772e05cfd8d6d04f1bdcba
tree043a0f344ace5af6cbec1638e566e0951adf8d44
parent1c8407f88e02ea7378656fdabcb55a7fa28a48c6
parentc3bf6e05eb93a700ff8f72d596a9bbcb89196184
Merge commit 'c3bf6e05eb93a700ff8f72d596a9bbcb89196184' into develop-3.0