[wine/f13/master: 17/17] merge from master

[Andreas Bierfert]

commit 4b1061fe09682e1b73ab51b16a1fe75d93e295d2
Merge: 0e7c3ed c950f73
Author: Andreas Bierfert <andreas.bierfert at lowlatency.de>
Date:   Wed Aug 18 10:49:31 2010 +0200

    merge from master

 .gitignore                    |    2 +-
 sources                       |    2 +-
 wine-gecko.patch              |    6 +++---
 wine-preloader-segfault.patch |   11 -----------
 wine.spec                     |   19 ++++++++++++-------
 5 files changed, 17 insertions(+), 23 deletions(-)
---
diff --cc .gitignore
index 7ffd599,e24d48c..151a41e
--- a/.gitignore
+++ b/.gitignore
@@@ -1,1 -1,2 +1,1 @@@
--wine-1.2.tar.bz2
+ wine-1.3.0.tar.bz2