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

[Liang Suilong]

commit c404ec65e21099fd9ebc01fc4b4ba54860913ca2
Merge: 837d349 47bd54a
Author: Fedora <fedora at fedora-desktop.(none)>
Date:   Fri Apr 27 00:41:28 2012 +0800

    Merge branch 'master' into f16

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