merge of '112ba3baa73bf6c445009481cef0ee0f5371e549'
authorMichael Lauer <mickey@vanille-media.de>
Sun, 22 Jun 2008 21:50:29 +0000 (21:50 +0000)
committerMichael Lauer <mickey@vanille-media.de>
Sun, 22 Jun 2008 21:50:29 +0000 (21:50 +0000)
     and 'baa34221f43a077c05372f6d2f1e4931e764d666'


Trivial merge