merge of '7286f9ae22f31fb7a8b5f1180a47ea9c0d0b8684'
authorMichael Lauer <mickey@vanille-media.de>
Tue, 28 Aug 2007 01:00:38 +0000 (01:00 +0000)
committerMichael Lauer <mickey@vanille-media.de>
Tue, 28 Aug 2007 01:00:38 +0000 (01:00 +0000)
commit8fd855f2919e2e33163d38af0c4602cee1240422
tree5c42038894962ed4fb38fc756565ba7f794e0ece
parent446ce329e2b6d14f48efe4dcf3cd78234bc2e0fc
parent72eb5a51a982cf2336417a22812b48e26787e398
Merge ... '7286f9ae22f31fb7a8b5f1180a47ea9c0d0b8684'
     and 'c288a6b0de570eee76783fd7b34698c396cd22fb'