[wine: 2/2] Merge branch 'f15'

[Andreas Bierfert]

commit c94dfa4aea3f8f69e12699f61052616d33c20175
Merge: 82386f4 268c264
Author: Andreas Bierfert <andreas.bierfert at lowlatency.de>
Date:   Mon May 16 08:04:39 2011 +0200

    Merge branch 'f15'

 .gitignore                                         |    1 +
 sources                                            |    2 +-
 wine.spec                                          |   10 ++++++++--
 ...19.patch => winepulse-configure.ac-1.3.20.patch |   12 ++++++------
 4 files changed, 16 insertions(+), 9 deletions(-)
---