merge of 'a861d7ae9f7e1ef52c56fcb6017fe9b7c48dc72b'
authorMichael Lauer <mickey@vanille-media.de>
Tue, 4 Dec 2007 01:17:48 +0000 (01:17 +0000)
committerMichael Lauer <mickey@vanille-media.de>
Tue, 4 Dec 2007 01:17:48 +0000 (01:17 +0000)
commit894335a1acd1fabdb37c25773ffdd0f795f570c4
treee1cf9ce1baafed9209c632a279a15f08f415d3c0
parent875cfc6f23ae68c6215bf32eb01a486f0387cb92
parentc9d9284e477752680bc176a2fa919c8fe14f5ee8
Merge ... 'a861d7ae9f7e1ef52c56fcb6017fe9b7c48dc72b'
     and 'faf33dcbfd35dd67bb0aea23b73e2eed42cd7226'