merge of '8be6702870d00e547e81f68f3feffa5ba236e7ac'
authorMichael Lauer <mickey@vanille-media.de>
Wed, 24 Oct 2007 08:21:25 +0000 (08:21 +0000)
committerMichael Lauer <mickey@vanille-media.de>
Wed, 24 Oct 2007 08:21:25 +0000 (08:21 +0000)
commit15923ae1527b4da767f067b8c166625ad28375ad
tree860235bc007c353db5b815063190b5c49b2fa6ae
parent34c2b7c694e615ab257b0f2954943c3cb0661fed
parent2cc9520a6d2d6ad98e00039b989639c586f48861
Merge ... '8be6702870d00e547e81f68f3feffa5ba236e7ac'
     and 'cbec50f53eb6e573a76ee660b0607c64d3e95d99'