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)

Trivial merge