[perl-Convert-UUlib/el6/master: 8/8] Merge remote branch 'origin/master' into el6

[Robert Scheck]

commit ece94cb8145e6a711edca25ab03baad83d57fa05
Merge: 6f618ca 5734781
Author: Robert Scheck <robert at fedoraproject.org>
Date:   Tue Dec 28 01:56:29 2010 +0100

    Merge remote branch 'origin/master' into el6
    
    Conflicts:
    	.gitignore
    	perl-Convert-UUlib.spec
    	sources

 .gitignore              |    2 +-
 perl-Convert-UUlib.spec |   13 +++++++++++--
 sources                 |    2 +-
 3 files changed, 13 insertions(+), 4 deletions(-)
---