[ibus-chewing/f13/master: 12/12] Merge branch 'master' into f13

[Ding-Yi Chen]

commit b12746a71c7130364290b0896eb961a8a032e751
Merge: f2017be 45c03a0
Author: Ding-Yi Chen <dingyichen at gmail.com>
Date:   Sat Sep 11 00:40:33 2010 +1000

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

 .gitignore        |    1 +
 ibus-chewing.spec |   35 ++++++++++++++++-------------------
 sources           |    2 +-
 3 files changed, 18 insertions(+), 20 deletions(-)
---
diff --cc ibus-chewing.spec
index 30949ee,8d525cc..f71e34c
--- a/ibus-chewing.spec
+++ b/ibus-chewing.spec
@@@ -337,9 -340,4 +340,3 @@@ Fix the errors which Funda Wang as poin
  - The first version.
  
  
--
- 
- 
- 
- 
-