merge of 'd506336ff98cc7331f3a17226b7b10cef8817694'
authorMichael Lauer <mickey@vanille-media.de>
Wed, 9 Apr 2008 00:17:35 +0000 (00:17 +0000)
committerMichael Lauer <mickey@vanille-media.de>
Wed, 9 Apr 2008 00:17:35 +0000 (00:17 +0000)
     and 'f4ac5cba40afcaee88ee7f46e4ac7ae23cedea9d'


Trivial merge