Merge remote-tracking branch 'rk/develop-3.10' into develop-3.10
authorroger <cz@rock-chips.com>
Mon, 22 Sep 2014 07:33:13 +0000 (15:33 +0800)
committerroger <cz@rock-chips.com>
Mon, 22 Sep 2014 07:33:13 +0000 (15:33 +0800)

Trivial merge