merge of '1543d455b98f10988b3ae9a01d9e2f61ff07e2f1'
authorMichael Lauer <mickey@vanille-media.de>
Fri, 29 Feb 2008 19:11:14 +0000 (19:11 +0000)
committerMichael Lauer <mickey@vanille-media.de>
Fri, 29 Feb 2008 19:11:14 +0000 (19:11 +0000)
     and '2450408c60daf405a9bb6b3b73d1529280dc244f'


Trivial merge