[ibus-chewing/f12/master: 22/22] Merge branch 'master' into f12

[Ding-Yi Chen]

commit 275d3e377d69c7f44009a8a6002cad299128e0fd
Merge: 64be12a 45c03a0
Author: Ding-Yi Chen <dingyichen at gmail.com>
Date:   Sat Sep 11 00:44:13 2010 +1000

    Merge branch 'master' into f12
    
    Conflicts:
    	.gitignore
    	ibus-chewing.spec
    	sources

 .gitignore        |    1 +
 ibus-chewing.spec |   36 ++++++++++++++++--------------------
 sources           |    2 +-
 3 files changed, 18 insertions(+), 21 deletions(-)
---
diff --cc ibus-chewing.spec
index 30949ee,8d525cc..a9e078b
--- a/ibus-chewing.spec
+++ b/ibus-chewing.spec
@@@ -336,10 -339,5 +339,3 @@@ Fix the errors which Funda Wang as poin
  * Fri Aug 15 2008 Huang Peng <shawn.p.huang at gmail.com> - 0.1.1.20081023-1
  - The first version.
  
--
--
- 
- 
- 
- 
-