Merge branch 'release-v0.1alpha2' v0.1alpha2
authortraits <traits.zhang@gmail.com>
Thu, 23 Jun 2011 07:18:40 +0000 (15:18 +0800)
committertraits <traits.zhang@gmail.com>
Thu, 23 Jun 2011 07:18:40 +0000 (15:18 +0800)

Trivial merge