[wine/f14/master: 2/2] Merge branch 'master' into f14

[Andreas Bierfert]

commit 07526a794e2693bdf2171d8c1ad77783418a8ec1
Merge: 1871e50 84fda39
Author: Andreas Bierfert <andreas.bierfert at lowlatency.de>
Date:   Wed Aug 25 15:46:37 2010 +0200

    Merge branch 'master' into f14

 .gitignore |    1 +
 sources    |    2 +-
 wine.spec  |   12 ++++++++++--
 3 files changed, 12 insertions(+), 3 deletions(-)
---