Merge branch 'bopomofo'
authorPeng Huang <shawn.p.huang@gmail.com>
Mon, 17 May 2010 02:41:11 +0000 (10:41 +0800)
committerPeng Huang <shawn.p.huang@gmail.com>
Mon, 17 May 2010 02:41:11 +0000 (10:41 +0800)
commit51438d761eb28fc9c19efc7eef82681ebdc86e65
treee4376d04599181443cfd85c12c9c9edc8c6794b4
parent28d811bfa3676d1f96ec7b366caedececb6cc60b
parentc5aefb2ca27010474d12032f51be840c92ed4770
Merge branch 'bopomofo'

Conflicts:
ibus-pinyin.spec.in
ibus-pinyin.spec.in