Merge remote-tracking branch 'origin/develop-3.0' into develop-3.0-jb
author黄涛 <huangtao@rock-chips.com>
Wed, 25 Jul 2012 06:19:53 +0000 (14:19 +0800)
committer黄涛 <huangtao@rock-chips.com>
Wed, 25 Jul 2012 06:19:53 +0000 (14:19 +0800)

Trivial merge