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)
commitd1e1567feffb4ca2138d1eb548af7fbac9212ee3
tree8a695d301599c05fe53ab412727e0c47c60531cd
parentae45c0b308be4eace3430acb0b4f28db337f1b9e
parented467f836f50494acb1b90c946c152f89e262d33
Merge commit 'origin/develop' into develop