Merge remote-tracking branch 'origin/develop-3.0' into develop-3.0-rk2928
authorkfx <kfx@rock-chips.com>
Tue, 17 Jul 2012 02:11:22 +0000 (10:11 +0800)
committerkfx <kfx@rock-chips.com>
Tue, 17 Jul 2012 02:11:22 +0000 (10:11 +0800)
commit8d247adbfbecb1ecf455922fdc74c393ad109c60
tree22b1b93c76c7622aa4a79ab1dd0f7f805e48a43a
parent64a147f2460aedc9f857a6800516f49d155a9019
parentff49459a0c380a0605043a5f36c7c28aad246653
Merge remote-tracking branch 'origin/develop-3.0' into develop-3.0-rk2928