Merge remote branch 'byvoid/fallbackeditor'
authorPeng Huang <shawn.p.huang@gmail.com>
Tue, 25 May 2010 08:30:40 +0000 (16:30 +0800)
committerPeng Huang <shawn.p.huang@gmail.com>
Tue, 25 May 2010 08:30:40 +0000 (16:30 +0800)

Trivial merge