[fcitx/f16: 4/5] Merge branch 'master' into f16

[Liang Suilong]

commit ba2ce111a5cab81127ade5a10a24de307c17528a
Merge: a7e47d9 f776a84
Author: Fedora <fedora at fedora-desktop.(none)>
Date:   Wed Jun 6 01:17:50 2012 +0800

    Merge branch 'master' into f16

 .gitignore |    1 +
 fcitx.spec |  130 ++++++++++++++++++++++++++++++++++++++++++++----------------
 sources    |    1 +
 3 files changed, 98 insertions(+), 34 deletions(-)
---