Merge branch 'develop'
authorZhang Xianyi <traits.zhang@gmail.com>
Tue, 23 Jul 2013 05:40:08 +0000 (13:40 +0800)
committerZhang Xianyi <traits.zhang@gmail.com>
Tue, 23 Jul 2013 05:40:08 +0000 (13:40 +0800)

Trivial merge