merge of 'ae6ce280f42d7c00188fa2fe1ff67bb12aacd5e5'
authorMichael Lauer <mickey@vanille-media.de>
Tue, 16 Oct 2007 15:32:07 +0000 (15:32 +0000)
committerMichael Lauer <mickey@vanille-media.de>
Tue, 16 Oct 2007 15:32:07 +0000 (15:32 +0000)
     and 'd63819fa685c3d0474a7e11368d9dafdbcb3404f'


Trivial merge