merge of '1e83baccab5ff8f9286b326ca23932f59ccea5b0'
authorMichael Lauer <mickey@vanille-media.de>
Sun, 19 Aug 2007 00:14:10 +0000 (00:14 +0000)
committerMichael Lauer <mickey@vanille-media.de>
Sun, 19 Aug 2007 00:14:10 +0000 (00:14 +0000)
     and '50f929f94594bd46c5cccc70110c1de0e52a0ee4'


Trivial merge