Merge remote-tracking branch 'origin/develop-3.0' into develop-3.0-rk2928
author黄涛 <huangtao@rock-chips.com>
Thu, 5 Jul 2012 10:23:56 +0000 (18:23 +0800)
committer黄涛 <huangtao@rock-chips.com>
Thu, 5 Jul 2012 10:23:56 +0000 (18:23 +0800)

Trivial merge