[fcitx/f14: 7/7] Merge branch 'master' into f14

[Liang Suilong]

commit 80f70882ac30cbf33a4f3c4ca0e7c7b6d2abd142
Merge: 30d4002 5ffcfd7
Author: Fedora <fedora at fedora-desktop.(none)>
Date:   Fri Sep 9 23:42:09 2011 +0800

    Merge branch 'master' into f14

 .gitignore |    1 +
 fcitx.spec |  245 ++++++++++++++++++++++++++++-------------------------------
 sources    |    1 +
 3 files changed, 118 insertions(+), 129 deletions(-)
---