Merge branch 'develop'
authorZhang Xianyi <traits.zhang@gmail.com>
Mon, 8 Oct 2012 05:38:03 +0000 (13:38 +0800)
committerZhang Xianyi <traits.zhang@gmail.com>
Mon, 8 Oct 2012 05:38:03 +0000 (13:38 +0800)

Trivial merge