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

[Liang Suilong]

commit 1adef828261bcd1c8f8a4ae972ed018926dbeb5b
Merge: 6aedf33 43fa508
Author: Fedora <fedora at fedora-desktop.(none)>
Date:   Sat Feb 4 13:51:55 2012 +0800

    Merge branch 'master' into f15
    
    Conflicts:
    	fcitx.spec

 fcitx.spec |    3 +++
 1 files changed, 3 insertions(+), 0 deletions(-)
---