Merge remote-tracking branch 'origin/develop-3.0' into develop-3.0-rk2928
authorkfx <kfx@rock-chips.com>
Tue, 17 Jul 2012 02:11:22 +0000 (10:11 +0800)
committerkfx <kfx@rock-chips.com>
Tue, 17 Jul 2012 02:11:22 +0000 (10:11 +0800)

Trivial merge