[sunpinyin: 2/2] Merge branch 'master' of ssh://pkgs.fedoraproject.org/sunpinyin

[Liang Suilong]

commit 15cf86c515dfa26c8a1c5b1da6c8986b00bc63ac
Merge: 4189e81 c14a549
Author: Fedora <fedora at fedora-desktop.(none)>
Date:   Thu Jul 26 00:14:03 2012 +0800

    Merge branch 'master' of ssh://pkgs.fedoraproject.org/sunpinyin
    
    Conflicts:
    	sunpinyin.spec

 sunpinyin.spec |    8 ++++++--
 1 files changed, 6 insertions(+), 2 deletions(-)
---
diff --cc sunpinyin.spec
index d4b3321,dd04f83..12fbde3
--- a/sunpinyin.spec
+++ b/sunpinyin.spec
@@@ -3,7 -3,7 +3,7 @@@
  
  Name:		sunpinyin
  Version:	2.0.4
--Release:	0.3%{?dist}
++Release:	0.4%{?dist}
  Summary:	A statistical language model based Chinese input method engine
  Group:		System Environment/Libraries
  License:	LGPLv2 or CDDL
@@@ -198,9 -198,9 +198,13 @@@ f
  %config %{_xinputconf}
  
  %changelog
- * Thu Jul 26 2012 Liang Suilong <liangsuilong at gmail.com> - 2.0.4-0.3
++<<<<<<< HEAD
++* Thu Jul 26 2012 Liang Suilong <liangsuilong at gmail.com> - 2.0.4-0.4
 +- Upstream to the latest git snapshot
 +
+ * Sat Jul 21 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.0.4-0.3
+ - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
+ 
  * Sun Jun 03 2012 Liang Suilong <liangsuilong at gmail.com> - 2.0.4-0.2
  - Upstream to the latest git snapshot