[ibus-chewing/f16: 7/7] Merge branch 'master' into f16

[Ding-Yi Chen]

commit 969f6c54db0791abfa7da55c81f0491f8eb68f17
Merge: 99bb253 dac242c
Author: Ding-Yi Chen <dingyichen at gmail.com>
Date:   Mon Jul 23 10:08:13 2012 +1000

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

 .gitignore        |    1 +
 ibus-chewing.spec |   52 +++++++++++++++++++++++++---------------------------
 sources           |    2 +-
 3 files changed, 27 insertions(+), 28 deletions(-)
---