merge of '27e74ef96f09a42940bdd926f11c1d423d1e1eba'
authorMichael Lauer <mickey@vanille-media.de>
Fri, 2 Nov 2007 12:08:03 +0000 (12:08 +0000)
committerMichael Lauer <mickey@vanille-media.de>
Fri, 2 Nov 2007 12:08:03 +0000 (12:08 +0000)
commit07205e09037157c804eb669f2cff2ceb87e165e8
treea3fff6ed3ccb146b5ec0efd12a54c82050b5472f
parent60d98f25ec00aa5f3e1c44893486411cbe54f89e
parentac2ba6b3470a9e8c67a5cb185abd68bf7d83cb11
Merge ... '27e74ef96f09a42940bdd926f11c1d423d1e1eba'
     and 'edb8cd28fd8376663f333ba190c7e25b5ebf3794'