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

[Liang Suilong]

commit 33147022006e946c9203e680906b044f5573016a
Merge: 0e325c0 e6b345a
Author: Fedora <fedora at fedora-desktop.(none)>
Date:   Tue Jul 24 23:18:01 2012 +0800

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

 .gitignore |    1 +
 fcitx.spec |   17 +++++++++++++++--
 sources    |    1 +
 3 files changed, 17 insertions(+), 2 deletions(-)
---
diff --cc fcitx.spec
index cb96d96,09dd178..90b1869
--- a/fcitx.spec
+++ b/fcitx.spec
@@@ -4,8 -4,8 +4,8 @@@
  
  Name:			fcitx
  Summary:		Free Chinese Input Toy for X (XIM)
- Version:		4.2.4
- Release:		2.1%{?dist}
+ Version:		4.2.5
 -Release:		1%{?dist}
++Release:		1.1%{?dist}
  License:		GPLv2+
  Group:			User Interface/Desktops
  URL:			http://code.google.com/p/%{name}/
@@@ -305,9 -308,12 +306,21 @@@ update-desktop-database %{_datadir}/app
  
  
  %changelog
++* Tue Jul 24 2012 Liang Suilong <liangsuilong at gmail.com> - 4.2.5-1.1
++- Disable GIR Binding on Fedora 16
++
+ * Sun Jul 22 2012 Liang Suilong <liangsuilong at gmail.com> - 4.2.5-1
+ - Upstream to fcitx-4.2.5
+ 
 +* Thu Jun 07 2012 Liang Suilong <liangsuilong at gmail.com> - 4.2.4-2.1
 +- Disable GIR Binding on Fedora 16
 +
++- Upstream to fcitx-4.2.5
++
+ * Thu Jul 19 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 4.2.4-3
+ - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
++>>>>>>> master
+ 
  * Thu Jun 07 2012 Liang Suilong <liangsuilong at gmail.com> - 4.2.4-2
  - Drop fcitx-keyboard
  - Divide Table Engine into fcitx-table