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


Trivial merge