Merge branch 'develop-3.10'
authorheyun <heyun@rock-chips.com>
Mon, 15 Sep 2014 08:01:01 +0000 (16:01 +0800)
committerheyun <heyun@rock-chips.com>
Mon, 15 Sep 2014 08:01:05 +0000 (16:01 +0800)

Trivial merge