Merge branch 'bopomofo'

Conflicts:
	ibus-pinyin.spec.in

diff --cc ibus-pinyin.spec.in
index 7ae636e,90dba78..4e02b07
--- 1/ibus-pinyin.spec.in
--- 2/ibus-pinyin.spec.in
+++ b/ibus-pinyin.spec.in
@@@ -35,17 -35,17 +35,17 @@@ Provides:   ibus-pinyin-d
  Requires(post): sqlite
  
  %description db-open-phrase
- The phrase database for ibus Pinyin from open-phrase project.
 -The open phrase database for ibus Pinyin and Bopomofo engines.
++The phrase database for ibus Pinyin and Bopomofo from open-phrase project.
  
  %package    db-android
- Summary:    The android phrase database for ibus Pinyin
+ Summary:    The android phrase database for ibus Pinyin and Bopomofo
  Group:      System Environment/Libraries
  BuildArch:  noarch
  Provides:   ibus-pinyin-db
  Requires(post): sqlite
  
  %description db-android
- The phrase database for ibus Pinyin from android project.
 -The android phrase database for ibus Pinyin and Bopomofo engines.
++The phrase database for ibus Pinyin and Bopomofo from android project.
  
  %prep
  %setup -q