merge of '324c9ae28ad0981fb0295081bc51f62d2b0333ab'
authorMichael Lauer <mickey@vanille-media.de>
Fri, 18 Jan 2008 00:51:26 +0000 (00:51 +0000)
committerMichael Lauer <mickey@vanille-media.de>
Fri, 18 Jan 2008 00:51:26 +0000 (00:51 +0000)
     and '6fdc0cb19db57ac2a4d88dec24b554f7b34c593d'


Trivial merge