Merge commit 'eaf65a391f528189b6635a624251652208b36bab' into develop-3.0
authoryangkai <yk@rock-chips.com>
Mon, 3 Sep 2012 10:06:53 +0000 (18:06 +0800)
committeryangkai <yk@rock-chips.com>
Mon, 3 Sep 2012 10:06:53 +0000 (18:06 +0800)

Trivial merge