Merge branch 'bulldozer' into develop
authorZhang Xianyi <traits.zhang@gmail.com>
Sat, 24 Aug 2013 14:46:18 +0000 (11:46 -0300)
committerZhang Xianyi <traits.zhang@gmail.com>
Sat, 24 Aug 2013 14:46:18 +0000 (11:46 -0300)

Trivial merge