Merge remote-tracking branch 'origin/develop-3.0' into develop-3.0-rk2928
authorkfx <kfx@rock-chips.com>
Tue, 10 Jul 2012 06:57:28 +0000 (14:57 +0800)
committerkfx <kfx@rock-chips.com>
Tue, 10 Jul 2012 06:57:28 +0000 (14:57 +0800)
commit10690a80e1ab88cdab62dba89818b7a8ed1afa4f
tree5564d3200b2dce86910057d543053464342f6fe4
parentb9eb3fa8bb0980e3a736bfebcd5715e83de6487c
parentfdf7df16f38c549b5dc3c806b8e7374ecf14182c
Merge remote-tracking branch 'origin/develop-3.0' into develop-3.0-rk2928