merge of '056153b8d72df761dd453a0744b47f49b1526274'
authorMichael Lauer <mickey@vanille-media.de>
Fri, 3 Aug 2007 13:48:01 +0000 (13:48 +0000)
committerMichael Lauer <mickey@vanille-media.de>
Fri, 3 Aug 2007 13:48:01 +0000 (13:48 +0000)
commit27c6c06e8536256c8d54e388da40c414bcd00586
treec703f266585d20cbdf50cb4cdc6cb879355a0dc7
parent0d35ecd879b1aef4618e9ec712d13032400dc167
parentfa52b5bb47dd65353901a1218ddd9dc8a6042f3e
Merge ... '056153b8d72df761dd453a0744b47f49b1526274'
     and '84faa8309d20a2d72895ea64790f085a69d15fab'