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)
commit66e98ed38924c99299a72ba70833a727c5879fd2
tree689ee4df32f95f94c6b080b4f81dcc8b29731fe0
parentdcc33f8c64391080b5aa67430c07da602965c4ef
parenteaf65a391f528189b6635a624251652208b36bab
Merge commit 'eaf65a391f528189b6635a624251652208b36bab' into develop-3.0