Merge branch 'master' into develop
authorZhang Xianyi <traits.zhang@gmail.com>
Tue, 18 Dec 2012 00:51:30 +0000 (08:51 +0800)
committerZhang Xianyi <traits.zhang@gmail.com>
Tue, 18 Dec 2012 00:51:30 +0000 (08:51 +0800)

Trivial merge