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

[Robert Scheck]

commit 6ecec5bfe9735f2df90b135fb94ef2a48f64aada
Merge: 5cf266c a6ee884
Author: Robert Scheck <robert at fedoraproject.org>
Date:   Mon Oct 4 23:39:49 2010 +0200

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

 .gitignore                   |    2 +-
 libucil-0.9.8-bz627890.patch |   17 +++++++++++++++++
 libucil.spec                 |   32 +++++++++++++++++++++++++++++---
 sources                      |    2 +-
 4 files changed, 48 insertions(+), 5 deletions(-)
---