merge of '2af79ceb1e37ba57b38b201f8034eb9d90da8f12'
authorMichael Lauer <mickey@vanille-media.de>
Wed, 6 Sep 2006 20:29:36 +0000 (20:29 +0000)
committerMichael Lauer <mickey@vanille-media.de>
Wed, 6 Sep 2006 20:29:36 +0000 (20:29 +0000)
     and '337cfe2dd7c694a21c34148c5094a3ab6d4f6b8f'


Trivial merge