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

Trivial merge