Merge remote branch 'byvoid/st_switch_hotkey'
authorPeng Huang <shawn.p.huang@gmail.com>
Sun, 23 May 2010 23:29:27 +0000 (07:29 +0800)
committerPeng Huang <shawn.p.huang@gmail.com>
Sun, 23 May 2010 23:29:27 +0000 (07:29 +0800)

Trivial merge