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

[Liang Suilong]

commit 44ad006468c7b13072eba7cc0c51b2098dcfad9a
Merge: 0bc7823 318e425
Author: Fedora <fedora at fedora-desktop.(none)>
Date:   Sun Dec 25 02:30:25 2011 +0800

    Merge branch 'master' into f16

 fcitx.spec |   14 +++++++++++++-
 1 files changed, 13 insertions(+), 1 deletions(-)
---