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

[Liang Suilong]

commit 7c3a036960ab18e0a43bf739e6420ebb7777adc4
Merge: 4f2e64a 41182b4
Author: Fedora <fedora at fedora-desktop.(none)>
Date:   Fri Sep 9 16:50:35 2011 +0800

    Merge branch 'master' into f16

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