[libunicap/el5/master: 5/5] Merge remote branch 'origin/master' into el5

[Robert Scheck]

commit 2a191e4bd683a9dadfb94bfdf0cde253e15c973e
Merge: c1bb8d6 d6b2540
Author: Robert Scheck <robert at fedoraproject.org>
Date:   Mon Oct 4 22:21:20 2010 +0200

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

 .gitignore                      |    2 +-
 libunicap-0.9.12-includes.patch |   15 +++++++++++++++
 libunicap.spec                  |   16 ++++++++++++++--
 sources                         |    2 +-
 4 files changed, 31 insertions(+), 4 deletions(-)
---