Merge commit '9ce928373554c3d1616076a0dd421d0a333755c9' into develop-3.0
authoryangkai <yk@rock-chips.com>
Thu, 6 Sep 2012 08:19:07 +0000 (16:19 +0800)
committeryangkai <yk@rock-chips.com>
Thu, 6 Sep 2012 08:19:07 +0000 (16:19 +0800)
commitf9dc13b34c9779115cde8afc1eb0e2ad6e8e9569
tree5099b00a80dd83a2488b1e22c22e506759ebd486
parent4643c65ce5d40e59fbc0345f3f0d8db9abc88ba2
parent9ce928373554c3d1616076a0dd421d0a333755c9
Merge commit '9ce928373554c3d1616076a0dd421d0a333755c9' into develop-3.0