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

[Liang Suilong]

commit 01444a4a285959619c2737ef9a1c14cfeb4f6bd1
Merge: 44ad006 df966db
Author: Fedora <fedora at fedora-desktop.(none)>
Date:   Sun Dec 25 21:54:21 2011 +0800

    Merge branch 'master' into f16

 fcitx.spec |    7 +++++--
 1 files changed, 5 insertions(+), 2 deletions(-)
---