Merge remote branch 'wlf/develop-3.0-rk2928' into develop-3.0-rk2928
authoryangkai <yk@rock-chips.com>
Tue, 31 Jul 2012 02:41:29 +0000 (10:41 +0800)
committeryangkai <yk@rock-chips.com>
Tue, 31 Jul 2012 02:41:29 +0000 (10:41 +0800)

Trivial merge