merge of '288800330cbc2faa2cdc0823b0016b858b6bee68'
authorMichael Lauer <mickey@vanille-media.de>
Sat, 16 Feb 2008 16:23:55 +0000 (16:23 +0000)
committerMichael Lauer <mickey@vanille-media.de>
Sat, 16 Feb 2008 16:23:55 +0000 (16:23 +0000)
     and '6fbaa4dcc3640605ad76e93bbea2d08d823badbb'


Trivial merge