merge of 'b40ff574864609e2e568aaadd2819286b3608596'
authorMichael Lauer <mickey@vanille-media.de>
Thu, 10 Jan 2008 14:33:55 +0000 (14:33 +0000)
committerMichael Lauer <mickey@vanille-media.de>
Thu, 10 Jan 2008 14:33:55 +0000 (14:33 +0000)
commita16a829c4ef2335c75ff45591c71b891e2a4ebe8
treed8acb305fe196ae885ef7fb6118ff97cfff3c064
parentab154a507cd0cabf84f4822026075f22b35906a4
parentb53d9cb9172fa2bec04355930fc269af0bb87404
Merge ... 'b40ff574864609e2e568aaadd2819286b3608596'
     and 'ea02b45427ce0c5be80c8d3e8e927a9d71168320'