merge of '3e3e5c3190f2cb2e6fbed584c5049e73df49c04e'
authorMichael Lauer <mickey@vanille-media.de>
Mon, 21 Jul 2008 22:51:07 +0000 (22:51 +0000)
committerMichael Lauer <mickey@vanille-media.de>
Mon, 21 Jul 2008 22:51:07 +0000 (22:51 +0000)
     and 'b7c57ac566ade9b73a2dc88a9400d0667d979c84'


Trivial merge