merge of '430ec52386873d79595770650004fe72a7a0f620'
authorMichael Lauer <mickey@vanille-media.de>
Tue, 3 Jun 2008 15:10:49 +0000 (15:10 +0000)
committerMichael Lauer <mickey@vanille-media.de>
Tue, 3 Jun 2008 15:10:49 +0000 (15:10 +0000)
     and 'e112dc95accddc8f0f59b39818227d3e46468e57'


Trivial merge