merge of 'db0a0f72b9b3c3cf83b68ea72965aba206092766'
authorMichael Lauer <mickey@vanille-media.de>
Mon, 21 Apr 2008 00:42:58 +0000 (00:42 +0000)
committerMichael Lauer <mickey@vanille-media.de>
Mon, 21 Apr 2008 00:42:58 +0000 (00:42 +0000)
     and 'ec238858461bb40d136b48ac17f1ad9ee6b50c9e'


Trivial merge