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

[Liang Suilong]

commit 0e75cad75c2cd898a6d41f6dac90b020137f32d5
Merge: a3b3bce 47bd54a
Author: Fedora <fedora at fedora-desktop.(none)>
Date:   Fri Apr 27 00:42:09 2012 +0800

    Merge branch 'master' into f15

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