merge of '1680814672cc2662009b0e45fa9e20b4c5bc0968'
authorMichael Lauer <mickey@vanille-media.de>
Sun, 13 Jan 2008 19:38:16 +0000 (19:38 +0000)
committerMichael Lauer <mickey@vanille-media.de>
Sun, 13 Jan 2008 19:38:16 +0000 (19:38 +0000)
     and '9b6e07a74ea0e9d244bc786420721f90d0ce1204'


Trivial merge