Merge branch 'eterhack' of git.office:/projects/eterhack into eterhack
authorTest Robot <wine-patches-test@office.etersoft.ru>
Fri, 15 Apr 2011 12:10:56 +0000 (16:10 +0400)
committerTest Robot <wine-patches-test@office.etersoft.ru>
Fri, 15 Apr 2011 12:10:56 +0000 (16:10 +0400)

Trivial merge