Merge remote-tracking branch 'origin/develop-3.0' into develop-3.0-jb
author黄涛 <huangtao@rock-chips.com>
Tue, 24 Jul 2012 04:02:49 +0000 (12:02 +0800)
committer黄涛 <huangtao@rock-chips.com>
Tue, 24 Jul 2012 04:02:49 +0000 (12:02 +0800)

Trivial merge