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

[Robert Scheck]

commit 81fbf8fb10582619c829f36a90eb5e7b07b0b2c1
Merge: 9519883 ceb7729
Author: Robert Scheck <robert at fedoraproject.org>
Date:   Fri Oct 29 23:55:47 2010 +0200

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

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