Merge remote-tracking branch 'origin/develop-3.0-rk30' into develop-3.0
author黄涛 <huangtao@rock-chips.com>
Sun, 25 Mar 2012 07:17:35 +0000 (15:17 +0800)
committer黄涛 <huangtao@rock-chips.com>
Sun, 25 Mar 2012 07:17:35 +0000 (15:17 +0800)

Trivial merge