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

[Liang Suilong]

commit 4f2e64a05f86f798b064284e9541deed141f9a10
Merge: 99a7c18 66ddf35
Author: Fedora <fedora at fedora-desktop.(none)>
Date:   Tue Aug 2 17:52:58 2011 +0800

    Merge branch 'master' into f16

 fcitx.spec |   39 ++++++++++++++++++++++++++++++++++-----
 1 files changed, 34 insertions(+), 5 deletions(-)
---