Merge branch 'master' of github.com:phuang/ibus
authorPeng Huang <shawn.p.huang@gmail.com>
Wed, 27 Jan 2010 06:26:02 +0000 (14:26 +0800)
committerPeng Huang <shawn.p.huang@gmail.com>
Wed, 27 Jan 2010 06:26:02 +0000 (14:26 +0800)

Trivial merge