merge of '21a4d6e9a83528919c5fa1100510fac988f3fb20'
authorMichael Lauer <mickey@vanille-media.de>
Tue, 4 Mar 2008 19:07:55 +0000 (19:07 +0000)
committerMichael Lauer <mickey@vanille-media.de>
Tue, 4 Mar 2008 19:07:55 +0000 (19:07 +0000)
     and '36ae94ae884a55393124760a3d8811541c62e82d'


Trivial merge