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

[Liang Suilong]

commit 30d400231624b4513c32f318f46424ba2b5b6e23
Merge: d0d926d 41182b4
Author: Fedora <fedora at fedora-desktop.(none)>
Date:   Fri Sep 9 16:56:15 2011 +0800

    Merge branch 'master' into f14

 gnome3-mainwindow-pos-walkaround.patch |   12 -
 gnome3-tray-fix.patch                  |  366 --------------------------------
 2 files changed, 0 insertions(+), 378 deletions(-)
---