merge of '0df5b658b96f939f5d3b63df5415ea1d46d83f25'
authorMichael Lauer <mickey@vanille-media.de>
Fri, 27 Jun 2008 18:42:45 +0000 (18:42 +0000)
committerMichael Lauer <mickey@vanille-media.de>
Fri, 27 Jun 2008 18:42:45 +0000 (18:42 +0000)
     and '31de530bc2ccfc10a0020cfb5eab126481380149'


Trivial merge