Merge branch 'develop'
authorZhang Xianyi <traits.zhang@gmail.com>
Sat, 2 Mar 2013 06:24:23 +0000 (14:24 +0800)
committerZhang Xianyi <traits.zhang@gmail.com>
Sat, 2 Mar 2013 06:24:23 +0000 (14:24 +0800)

Trivial merge