merge of '23370e87858b05ea1295304df746770cdb584233'
authorMichael Lauer <mickey@vanille-media.de>
Fri, 3 Oct 2008 09:04:25 +0000 (09:04 +0000)
committerMichael Lauer <mickey@vanille-media.de>
Fri, 3 Oct 2008 09:04:25 +0000 (09:04 +0000)
     and '2c4fce4a2279b81964f4d6df1eb7ec66a8bd6796'


Trivial merge