Merge branch 'win7-taskbar'
commit165d0c136d646f49c79ef6722a1a81b5489c9f47
authorSven Strickroth <email@cs-ware.de>
Sun, 31 Jul 2011 19:17:55 +0000 (31 21:17 +0200)
committerSven Strickroth <email@cs-ware.de>
Sun, 31 Jul 2011 19:17:55 +0000 (31 21:17 +0200)
treedb7b93d1544309b0b5f7505901223d85fee4020d
parentd6c731c813b808e54846552ef56256eaf78d0e0f
parentea391951a88a99d993b5417b0ef991711b191d07
Merge branch 'win7-taskbar'

Signed-off-by: Sven Strickroth <email@cs-ware.de>