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

[Robert Scheck]

commit 7e6ec6fe5ab49d1fcf821cd376e04c0351c4e067
Merge: e94e469 ceb7729
Author: Robert Scheck <robert at fedoraproject.org>
Date:   Fri Oct 29 23:58:15 2010 +0200

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

 libunicap.spec |   23 +++++++++++++++++++----
 1 files changed, 19 insertions(+), 4 deletions(-)
---