Merge branch 'master' into develop
authorXianyi Zhang <traits.zhang@gmail.com>
Fri, 20 Jan 2012 13:32:13 +0000 (21:32 +0800)
committerXianyi Zhang <traits.zhang@gmail.com>
Fri, 20 Jan 2012 13:32:13 +0000 (21:32 +0800)

Trivial merge