[ibus-skk/f13/master: 7/7] Merge branch 'master' into f13

[Daiki Ueno]

commit 6483eee2f8dfe926919443ba419bfbd2e90e3781
Merge: fb86d6c 4e9c6f7
Author: Daiki Ueno <ueno at unixuser.org>
Date:   Tue Aug 3 17:08:59 2010 +0900

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

 .gitignore    |    2 +-
 ibus-skk.spec |    5 ++++-
 sources       |    2 +-
 3 files changed, 6 insertions(+), 3 deletions(-)
---
diff --cc .gitignore
index 35023a5,4489b23..3dd3c23
--- a/.gitignore
+++ b/.gitignore
@@@ -1,1 -1,2 +1,1 @@@
--ibus-skk-0.0.9.tar.gz
+ ibus-skk-0.0.10.tar.gz