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

[Robert Scheck]

commit 1135fa402d711a525836815a476a0f3f97757b45
Merge: 035d871 ceb7729
Author: Robert Scheck <robert at fedoraproject.org>
Date:   Fri Oct 29 23:53:55 2010 +0200

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

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