Merge remote branch 'origin/develop' into develop_kernel_hxy
authorroot <root@hxy-desktop.(none)>
Tue, 13 Jul 2010 09:21:36 +0000 (17:21 +0800)
committerroot <root@hxy-desktop.(none)>
Tue, 13 Jul 2010 09:21:36 +0000 (17:21 +0800)
commit70f9bba4d525679358d46a90c2ca3932e5a1da2b
treef9867429ce58fe769408d3f6a4fb4fa24286607f
parent73f23e681457c6d0b6330e1341f008d753350458
parent383f9ddb1da6be30f24a69415d6c4c296a3b4fa6
Merge remote branch 'origin/develop' into develop_kernel_hxy