Merge branch 'bulldozer' into develop
authorZhang Xianyi <traits.zhang@gmail.com>
Mon, 12 Aug 2013 15:22:10 +0000 (23:22 +0800)
committerZhang Xianyi <traits.zhang@gmail.com>
Mon, 12 Aug 2013 15:22:10 +0000 (23:22 +0800)

Trivial merge