merge of '266f6beb86630b70cfa55df7d2b557a677d187b0'
authorMichael Lauer <mickey@vanille-media.de>
Tue, 28 Aug 2007 15:57:07 +0000 (15:57 +0000)
committerMichael Lauer <mickey@vanille-media.de>
Tue, 28 Aug 2007 15:57:07 +0000 (15:57 +0000)
     and '893542e48954804c96a716027237dc29c119d78b'


Trivial merge