merge of '7f726014d804dac37f882d802eea690ed0c00cee'
authorMichael Lauer <mickey@vanille-media.de>
Tue, 23 Oct 2007 14:06:47 +0000 (14:06 +0000)
committerMichael Lauer <mickey@vanille-media.de>
Tue, 23 Oct 2007 14:06:47 +0000 (14:06 +0000)
     and 'de1ed6b33382c6e5abd3af8087cf833ca9a9c78b'


Trivial merge