Merge branch 'develop'
authorTz-Huan Huang <tzhuan@gmail.com>
Tue, 21 May 2013 01:05:56 +0000 (09:05 +0800)
committerTz-Huan Huang <tzhuan@gmail.com>
Tue, 21 May 2013 01:05:56 +0000 (09:05 +0800)

Trivial merge