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)
commit7d6e91f3b93e0df062ab65f68376eccab98f6d4f
treed397ef031bc9771d986cbf0f9991bddd3c9dafa6
parent746d83aac7061ca30b1cbea22630d1133ae44c14
parenta8aea20e19ead970a19154695905079cd81ded6b
Merge commit 'a8aea20e19ead970a19154695905079cd81ded6b' into develop-3.0