merge of '763273dbe0f8c69b58cb50ad1ae4131199baa08e'
authorMichael Lauer <mickey@vanille-media.de>
Tue, 24 Jun 2008 20:26:47 +0000 (20:26 +0000)
committerMichael Lauer <mickey@vanille-media.de>
Tue, 24 Jun 2008 20:26:47 +0000 (20:26 +0000)
     and 'b17e85be6490338fbc06d2ddf191cc651822a42d'


Trivial merge