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)
commit8d3bc008d4f4389626d8ad4a13c4d80677f3b474
tree60575ac47026c867b7340482cb113b9b038e8865
parent41c2e0dce750ad5205ae24eb72e0a59c6250cd26
parent489ed6b764ccf745cf2989cbcd5023d26b8f9a06
Merge ... 'ae6ce280f42d7c00188fa2fe1ff67bb12aacd5e5'
     and 'd63819fa685c3d0474a7e11368d9dafdbcb3404f'