Merge back commit from WineHQ

svn path=/trunk/; revision=8665
This commit is contained in:
Gé van Geldorp 2004-03-12 20:30:44 +00:00
parent 7f1a2fa09f
commit a990283857