merge of '0b7113a85be8ed98e75a1000c58eb9ea5de39919'
authorMichael Lauer <mickey@vanille-media.de>
Tue, 22 Jan 2008 02:08:50 +0000 (02:08 +0000)
committerMichael Lauer <mickey@vanille-media.de>
Tue, 22 Jan 2008 02:08:50 +0000 (02:08 +0000)
     and '43f6b35dcf8438ea9fc7e6a23fa4541225259e15'


Trivial merge