Merge branch 'develop'
authorZhang Xianyi <traits.zhang@gmail.com>
Mon, 26 Nov 2012 09:32:56 +0000 (17:32 +0800)
committerZhang Xianyi <traits.zhang@gmail.com>
Mon, 26 Nov 2012 09:32:56 +0000 (17:32 +0800)

Trivial merge