merge of '3b04f9d33d900f95c8814c78ad7693a4bd404ded'
authorMichael Lauer <mickey@vanille-media.de>
Sun, 8 Jul 2007 18:53:15 +0000 (18:53 +0000)
committerMichael Lauer <mickey@vanille-media.de>
Sun, 8 Jul 2007 18:53:15 +0000 (18:53 +0000)
commite35b03a3bad4a30461aad4fecb16a1a7a9c67d8a
tree6b5b8bccaaeb18d1cde7137c01c6c981d0950f48
parentc00723de0b20bbd6b1674442834d10bb68d78752
parentd539197e866ddfac5c6c2f6f91435df5310dd04a
Merge ... '3b04f9d33d900f95c8814c78ad7693a4bd404ded'
     and 'f6a57e1a7e63e62b04f74e02986c4cc6c30ece2a'