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

[Robert Scheck]

commit 1b2e4915df3a1cfac405ab9beee3c3a8d9c07bb2
Merge: e55c83e ceb7729
Author: Robert Scheck <robert at fedoraproject.org>
Date:   Fri Oct 29 23:54:54 2010 +0200

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

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