Merge remote-tracking branch 'origin/develop-3.0-jb' into develop-3.0
author黄涛 <huangtao@rock-chips.com>
Tue, 21 Aug 2012 11:55:23 +0000 (19:55 +0800)
committer黄涛 <huangtao@rock-chips.com>
Tue, 21 Aug 2012 11:55:23 +0000 (19:55 +0800)

Trivial merge