merge of 'db0a0f72b9b3c3cf83b68ea72965aba206092766'
authorMichael Lauer <mickey@vanille-media.de>
Mon, 21 Apr 2008 00:42:58 +0000 (00:42 +0000)
committerMichael Lauer <mickey@vanille-media.de>
Mon, 21 Apr 2008 00:42:58 +0000 (00:42 +0000)
commit7e263956d2b6c222f1a105fbfa2eb8abdcc14237
treed97d1b75d59b02e459f5b64e105a3cedcaeb7e41
parentbc2b35ac767c1410bd47a9fec4b313606566f4bd
parent94f8c3abcdfb60e8b4dd793efe275a16cb7939a1
Merge ... 'db0a0f72b9b3c3cf83b68ea72965aba206092766'
     and 'ec238858461bb40d136b48ac17f1ad9ee6b50c9e'