Merge branch 'winmail-dat-fix'
authorThomas Jarosch <thomas.jarosch@intra2net.com>
Wed, 20 Jul 2011 12:23:12 +0000 (14:23 +0200)
committerThomas Jarosch <thomas.jarosch@intra2net.com>
Wed, 20 Jul 2011 12:23:12 +0000 (14:23 +0200)

Trivial merge