friends to CVS for next merge. This patch applies clean to Winehq tip. svn path=/trunk/; revision=11624