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)

Trivial merge