merge of '1c6f6c20e33c23b718478f231d96591d2f567483'
authorMichael Lauer <mickey@vanille-media.de>
Sat, 17 Nov 2007 13:01:15 +0000 (13:01 +0000)
committerMichael Lauer <mickey@vanille-media.de>
Sat, 17 Nov 2007 13:01:15 +0000 (13:01 +0000)
     and '7b1dd96801f47207bea137bdc1cda343863a75ce'


Trivial merge