merge of '5a21ce3f8925a2f59922f56157e689a0b3da0ae7'
authorMichael Lauer <mickey@vanille-media.de>
Sun, 27 Jul 2008 21:55:44 +0000 (21:55 +0000)
committerMichael Lauer <mickey@vanille-media.de>
Sun, 27 Jul 2008 21:55:44 +0000 (21:55 +0000)
     and '5bb4bd3c22bd1d7fbf5eb23c0423846435ca5e06'


Trivial merge