Merge remote-tracking branch 'last/develop-3.0' into develop-3.0
author黄涛 <huangtao@rock-chips.com>
Fri, 25 Nov 2011 09:47:39 +0000 (17:47 +0800)
committer黄涛 <huangtao@rock-chips.com>
Fri, 25 Nov 2011 09:47:39 +0000 (17:47 +0800)
commitbb81a72d2270ca64fa49034fe48d652fe90184c3
treeb807057f7a63e7e8f917a650d3d6d022ef842920
parentadc8abbd9990ed0ac5d6b5c02dd14b933e1bf291
parent4c6d24c23b21bc896236be0f9f4c9567e55653d4
Merge remote-tracking branch 'last/develop-3.0' into develop-3.0