Merge branch 'eter-1.0.12' of git.office:/projects/eterhack into eter-1.0.12
authorTest Robot <wine-patches-test@office.etersoft.ru>
Wed, 17 Nov 2010 14:00:45 +0000 (17:00 +0300)
committerTest Robot <wine-patches-test@office.etersoft.ru>
Wed, 17 Nov 2010 14:00:45 +0000 (17:00 +0300)

Trivial merge