Merge commit '9ce928373554c3d1616076a0dd421d0a333755c9' into develop-3.0
authoryangkai <yk@rock-chips.com>
Thu, 6 Sep 2012 08:19:07 +0000 (16:19 +0800)
committeryangkai <yk@rock-chips.com>
Thu, 6 Sep 2012 08:19:07 +0000 (16:19 +0800)

Trivial merge