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

Trivial merge