Merge remote-tracking branch 'last/develop-3.0' into develop-3.0
author黄涛 <huangtao@rock-chips.com>
Fri, 25 Nov 2011 09:47:39 +0000 (17:47 +0800)
committer黄涛 <huangtao@rock-chips.com>
Fri, 25 Nov 2011 09:47:39 +0000 (17:47 +0800)

Trivial merge