Merge branch 'hotfix-0.1alpha2.1' into develop
authortraits <traits.zhang@gmail.com>
Tue, 28 Jun 2011 07:46:55 +0000 (15:46 +0800)
committertraits <traits.zhang@gmail.com>
Tue, 28 Jun 2011 07:46:55 +0000 (15:46 +0800)
commita5300420e24b05644885d2353af694b2a3dd135a
tree5c40102ab24403693d46c49716201bc40986c9b3
parentca8bf5abb0a2b32fbc5fee4f82e394a703649772
parentc06b7be32f622e5734fac8f09890d4078d3e0164
Merge branch 'hotfix-0.1alpha2.1' into develop