Merge remote branch 'origin/develop' into develop
author陈真 <chenz@rock-chips.com>
Wed, 23 Mar 2011 09:05:12 +0000 (17:05 +0800)
committer陈真 <chenz@rock-chips.com>
Wed, 23 Mar 2011 09:05:12 +0000 (17:05 +0800)
commitc479a969c5d7cd8d20ac99ea147a0fe7898ed076
treef309569fc746ed5de834cd7a655e04015004d629
parentcb3ff0d3d4ff2baeb4da5d191a42614d51ee06f4
parentd5815cc57db90ee063140548e7b57b577de28f16
Merge remote branch 'origin/develop' into develop