Merge remote-tracking branch 'origin/develop-3.0' into develop-3.0-rk2928
author黄涛 <huangtao@rock-chips.com>
Thu, 5 Jul 2012 10:23:56 +0000 (18:23 +0800)
committer黄涛 <huangtao@rock-chips.com>
Thu, 5 Jul 2012 10:23:56 +0000 (18:23 +0800)
commita604d350266fd6756f5765ae3aec231898f6c750
treee7aa8f488bca675d597a4238f25f8f1417a23f2f
parent64e1e8cff85ddcfe97b9d5525b879ffb5f51f0f9
parent79e6d3223ac12782fa0b2ebf591e2dd2e4c9896f
Merge remote-tracking branch 'origin/develop-3.0' into develop-3.0-rk2928