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

[Robert Scheck]

commit 0d2e713366141ca143c79b850b73f0c478ed091a
Merge: 1135fa4 d0c365b
Author: Robert Scheck <robert at fedoraproject.org>
Date:   Sun Oct 9 03:06:08 2011 +0200

    Merge remote branch 'origin/master' into f14

 libunicap-0.9.12-memerrs.patch  |   11 ---------
 libunicap-0.9.12-videodev.patch |   25 ++++++++++++++++++++
 libunicap-0.9.12-warnings.patch |   48 +++++++++++++++++++-------------------
 libunicap.spec                  |   18 +++++++++++++-
 4 files changed, 65 insertions(+), 37 deletions(-)
---