Merge remote-tracking branch 'origin/develop-3.0' into develop-3.0-jb
author黄涛 <huangtao@rock-chips.com>
Thu, 26 Jul 2012 09:35:10 +0000 (17:35 +0800)
committer黄涛 <huangtao@rock-chips.com>
Thu, 26 Jul 2012 09:35:10 +0000 (17:35 +0800)

Trivial merge