merge of '2dd66e01098fdefc97b79f2c26ae0b399f517579'
authorMichael Lauer <mickey@vanille-media.de>
Thu, 13 Dec 2007 22:43:51 +0000 (22:43 +0000)
committerMichael Lauer <mickey@vanille-media.de>
Thu, 13 Dec 2007 22:43:51 +0000 (22:43 +0000)
commit7adf6ab5dd75cf9b85acddac1e955f4ab72344fb
treefa0bb373ec0f83fdfdaded2b2f1d49ac7a6e56d0
parentec163abdb68da4938ee7ee153995fc680100a2b5
parent797990ba0f2ebd7b153e54e095d42927642ae27d
Merge ... '2dd66e01098fdefc97b79f2c26ae0b399f517579'
     and 'f4fae9004af31107f4f7bba2a4fae3dcb11bc1e5'