Merge commit 'origin/develop' into develop
authorroot <root@dxj.(none)>
Fri, 16 Jul 2010 07:17:58 +0000 (15:17 +0800)
committerroot <root@dxj.(none)>
Fri, 16 Jul 2010 07:17:58 +0000 (15:17 +0800)

Trivial merge