Merge commit 'e79de8f8dedb7f1f42eb44965b349559264b9827' into develop-3.0
authoryangkai <yk@rock-chips.com>
Tue, 18 Sep 2012 09:15:04 +0000 (17:15 +0800)
committeryangkai <yk@rock-chips.com>
Tue, 18 Sep 2012 09:15:04 +0000 (17:15 +0800)
commit85f3209ea8aa9ed40effbac69b1c8533a869a856
treef429f89dff8b2ddd9d598fe03faf13ce97998ad6
parente53728ff4012805b672a12191a2064d5672381b8
parente79de8f8dedb7f1f42eb44965b349559264b9827
Merge commit 'e79de8f8dedb7f1f42eb44965b349559264b9827' into develop-3.0