merge of 'af152d47ebbb835213adc897491fd19ccf8b4e1d'
authorMichael Lauer <mickey@vanille-media.de>
Sun, 17 Jun 2007 07:26:38 +0000 (07:26 +0000)
committerMichael Lauer <mickey@vanille-media.de>
Sun, 17 Jun 2007 07:26:38 +0000 (07:26 +0000)
     and 'b35bb3933a3e76175b51e40e2c83fdf1aafa3ed8'


Trivial merge