Merge branch 'release-0.1.0' into develop
authorXianyi Zhang <traits.zhang@gmail.com>
Fri, 23 Mar 2012 10:53:51 +0000 (18:53 +0800)
committerXianyi Zhang <traits.zhang@gmail.com>
Fri, 23 Mar 2012 10:53:51 +0000 (18:53 +0800)

Trivial merge