Merge remote-tracking branch 'origin/develop-3.0' into develop-3.0-rk2928
author黄涛 <huangtao@rock-chips.com>
Fri, 13 Jul 2012 11:24:46 +0000 (19:24 +0800)
committer黄涛 <huangtao@rock-chips.com>
Fri, 13 Jul 2012 11:24:46 +0000 (19:24 +0800)
commit84a3957cd4c682f31d4e9f2d7ba376cbb5c4b696
tree783ac1a2029cef9ea6077ab052434b8501cd5762
parenta6c33cb21c3792d27f40baa31cf045f229a1ead3
parent93e23ed86620eca06de588c0c7d5ded44f717210
Merge remote-tracking branch 'origin/develop-3.0' into develop-3.0-rk2928