Merge remote-tracking branch 'origin/develop-3.10' into develop-3.10-next
author黄涛 <huangtao@rock-chips.com>
Wed, 22 Oct 2014 11:05:55 +0000 (19:05 +0800)
committer黄涛 <huangtao@rock-chips.com>
Wed, 22 Oct 2014 11:05:55 +0000 (19:05 +0800)

Trivial merge