merge of '8f5711b8ee04e00c48f5997987d6ab4600e5dc19'
authorMichael Lauer <mickey@vanille-media.de>
Tue, 26 Aug 2008 15:35:52 +0000 (15:35 +0000)
committerMichael Lauer <mickey@vanille-media.de>
Tue, 26 Aug 2008 15:35:52 +0000 (15:35 +0000)
     and 'b04f946bcf310267d7557532bc06f235d79f8226'


Trivial merge