merge of '49d6fb299ea52b27b881053a089d50fa688a1582'
authorMichael Lauer <mickey@vanille-media.de>
Sun, 2 Mar 2008 22:35:06 +0000 (22:35 +0000)
committerMichael Lauer <mickey@vanille-media.de>
Sun, 2 Mar 2008 22:35:06 +0000 (22:35 +0000)
     and '89bcc665b5e831cc60b3aaef92e938c69ba33870'


Trivial merge