merge of 'aaf6c550254109a87b66440444b7d453231240a5'
authorMichael Lauer <mickey@vanille-media.de>
Thu, 14 Jun 2007 08:33:25 +0000 (08:33 +0000)
committerMichael Lauer <mickey@vanille-media.de>
Thu, 14 Jun 2007 08:33:25 +0000 (08:33 +0000)
     and 'b24e3d33fdc14fb2a96ead3a6312444644f1246d'


Trivial merge