Merge branch 'develop' into bulldozer
authorZhang Xianyi <traits.zhang@gmail.com>
Mon, 5 Aug 2013 07:51:53 +0000 (15:51 +0800)
committerZhang Xianyi <traits.zhang@gmail.com>
Mon, 5 Aug 2013 07:51:53 +0000 (15:51 +0800)

Trivial merge