[im-chooser/f13/master: 8/8] Merge remote branch 'origin/f14/master' into f13/master

[Akira TAGOH]

commit ee62ac49595436e98ef56692960bf8cf8812e80a
Merge: e9c056d b518975
Author: Akira TAGOH <tagoh at redhat.com>
Date:   Wed Sep 8 17:18:12 2010 +0900

    Merge remote branch 'origin/f14/master' into f13/master
    
    Conflicts:
    	.gitignore
    	im-chooser.spec
    	sources

 .gitignore      |    3 +++
 im-chooser.spec |    6 +++++-
 sources         |    2 +-
 3 files changed, 9 insertions(+), 2 deletions(-)
---