[w_scan/f13: 2/2] Merge remote-tracking branch 'origin/master' into f13

[Felix Kaechele]

commit d26f1f6602eefc798bf7a9e8fcae6ecebb5d6191
Merge: b5e5b74 ff2e934
Author: Felix Kaechele <heffer at fedoraproject.org>
Date:   Sun Jun 12 12:06:54 2011 +0200

    Merge remote-tracking branch 'origin/master' into f13

 .gitignore            |    1 +
 sources               |    2 +-
 w_scan-v4l1-fix.patch |   11 -----------
 w_scan.spec           |   10 +++++-----
 4 files changed, 7 insertions(+), 17 deletions(-)
---
diff --cc .gitignore
index 31db64e,9a177b7..5f687db
--- a/.gitignore
+++ b/.gitignore
@@@ -1,2 -1,4 +1,3 @@@
 -w_scan-20100529.tar.bz2
  /w_scan-20101001.tar.bz2
  /w_scan-20110206.tar.bz2
+ /w_scan-20110502.tar.bz2