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

[Liang Suilong]

commit fdb0b2e05e1ef2f9bf9418fa458cd934a8829a86
Merge: 7c3a036 5ffcfd7
Author: Fedora <fedora at fedora-desktop.(none)>
Date:   Fri Sep 9 23:40:07 2011 +0800

    Merge branch 'master' into f16

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