Merge commit 'a8aea20e19ead970a19154695905079cd81ded6b' into develop-3.0
authoryangkai <yk@rock-chips.com>
Tue, 16 Oct 2012 07:53:18 +0000 (15:53 +0800)
committeryangkai <yk@rock-chips.com>
Tue, 16 Oct 2012 07:53:18 +0000 (15:53 +0800)

Trivial merge