[ibus-hangul/f13/master: 3/3] Merge branch 'master' into f13

[Daiki Ueno]

commit 4dcf4acde13abf9c153c024b52c9f0b0396ef711
Merge: cb3ca6e ee858c3
Author: Daiki Ueno <ueno at unixuser.org>
Date:   Tue Aug 3 16:45:49 2010 +0900

    Merge branch 'master' into f13
    
    Conflicts:
    	.gitignore
    	ibus-hangul.spec

 ibus-hangul-HEAD.patch |  154 ++++++++++++++++++++++++++++++++++++++++++++++++
 ibus-hangul.spec       |    7 ++-
 2 files changed, 160 insertions(+), 1 deletions(-)
---
diff --cc ibus-hangul.spec
index f56d7ce,df9189c..cf8a444
--- a/ibus-hangul.spec
+++ b/ibus-hangul.spec
@@@ -3,7 -3,7 +3,7 @@@
  
  Name:       ibus-hangul
  Version:    1.3.0.20100329
--Release:    1%{?dist}
++Release:    2%{?dist}
  Summary:    The Hangul engine for IBus input platform
  License:    GPLv2+
  Group:      System Environment/Libraries
@@@ -52,9 -54,10 +54,12 @@@ rm -rf $RPM_BUILD_ROO
  %{_datadir}/ibus/component/*
  
  %changelog
 -* Tue Aug  3 2010 Daiki Ueno <dueno at redhat.com> - 1.3.0.20100329-1
 -- Update version to 1.3.0.20100329
++* Tue Aug  3 2010 Daiki Ueno <dueno at redhat.com> - 1.3.0.20100329-2
+ - Add ibus-hangul-HEAD.patch to synch it with the git master
+ 
 +* Tue Apr 06 2010 Peng Huang <shawn.p.huang at gmail.com> - 1.3.0.20100329-1
 +- Update version to 1.3.0.20100329
 +
  * Thu Feb 04 2010 Peng Huang <shawn.p.huang at gmail.com> - 1.2.0.20100102-1
  - Update version to 1.2.0.20100102
  - Add ibus-hangul-phuang.patch for ibus-1.2.99