Merge commit 'origin/develop' into develop
authorroot <root@dxj.(none)>
Fri, 16 Jul 2010 10:11:46 +0000 (18:11 +0800)
committerroot <root@dxj.(none)>
Fri, 16 Jul 2010 10:11:46 +0000 (18:11 +0800)

Trivial merge