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)
commit0fd331518d0898229e9e6747c636c3978028e7f0
tree9ec27295d0ea42b0305e76c795b1d027e3aebe30
parentc43801de18e79f25228ebe1202b790e0e977fd05
parent16afd0863a9a1c74b504790f18d674d9c7679003
Merge commit 'origin/develop' into develop