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

Trivial merge