[fswebcam/f14: 6/6] Merge branch 'master' into f14

[Fabian Affolter]

commit bfa3ed6433cda30755c8752089ba7722b572535a
Merge: 42993aa 86b1b6e
Author: Fabian Affolter <fabian at bernewireless.net>
Date:   Mon Jul 18 00:22:12 2011 +0200

    Merge branch 'master' into f14
    
    Conflicts:
    	fswebcam.spec
    	sources

 .gitignore    |    2 ++
 fswebcam.spec |    8 +++++++-
 sources       |    4 ++++
 3 files changed, 13 insertions(+), 1 deletions(-)
---
diff --cc sources
index 6353111,8909fa5..77bef95
--- a/sources
+++ b/sources
@@@ -1,1 -1,1 +1,5 @@@
++<<<<<<< HEAD
 +b4be05ed7c728c68424e947ed452b29f  fswebcam-20101118.tar.gz
++=======
+ 6e09f1f31cf7cd0ac1d4d688a0acbe41  fswebcam-20110717.tar.gz
++>>>>>>> master