merge of '59cab1cf7e6555c78e83160548945b0b63b193a9'
authorMichael Lauer <mickey@vanille-media.de>
Tue, 23 Oct 2007 08:15:40 +0000 (08:15 +0000)
committerMichael Lauer <mickey@vanille-media.de>
Tue, 23 Oct 2007 08:15:40 +0000 (08:15 +0000)
     and '5db403bd5d17402720832bf15a2ac01a04220cad'


Trivial merge