[im-chooser/f12/master: 14/14] Merge remote branch 'origin/f13/master' into f12/master

[Akira TAGOH]

commit 442064451b97b372415c58a3918199c3cde8887e
Merge: 25caab7 ee62ac4
Author: Akira TAGOH <tagoh at redhat.com>
Date:   Thu Sep 9 15:02:25 2010 +0900

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

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