merge of '2462bf8357f02f49aead6eafa119456a9e8c8b91'
authorMichael Lauer <mickey@vanille-media.de>
Tue, 15 Jan 2008 16:19:27 +0000 (16:19 +0000)
committerMichael Lauer <mickey@vanille-media.de>
Tue, 15 Jan 2008 16:19:27 +0000 (16:19 +0000)
     and '39f8c0faee1780e683399b25e5ca28f88f9e83ab'


Trivial merge