[libucil/f13/master: 10/10] Merge remote branch 'origin/master' into f13

[Robert Scheck]

commit dbeb5d5e9b30130791f0ad20b3b569c454067d5a
Merge: 852bc8e a6ee884
Author: Robert Scheck <robert at fedoraproject.org>
Date:   Mon Oct 4 23:36:27 2010 +0200

    Merge remote branch 'origin/master' into f13
    
    Conflicts:
    	.gitignore
    	libucil.spec
    	sources

 .gitignore   |    2 +-
 libucil.spec |   36 ++++++++++++++++--------------------
 sources      |    2 +-
 3 files changed, 18 insertions(+), 22 deletions(-)
---