Merge remote branch 'origin/develop' into develop
author陈真 <chenz@rock-chips.com>
Wed, 23 Mar 2011 09:05:12 +0000 (17:05 +0800)
committer陈真 <chenz@rock-chips.com>
Wed, 23 Mar 2011 09:05:12 +0000 (17:05 +0800)

Trivial merge