Merge remote-tracking branch 'origin/develop-3.0' into develop-3.0-jb
author黄涛 <huangtao@rock-chips.com>
Fri, 20 Jul 2012 02:42:06 +0000 (10:42 +0800)
committer黄涛 <huangtao@rock-chips.com>
Fri, 20 Jul 2012 02:42:06 +0000 (10:42 +0800)

Trivial merge