merge of '1de364fbbc0efdbe8f12facadb69f65193d6402b'
authorMichael Lauer <mickey@vanille-media.de>
Tue, 10 Jul 2007 21:57:23 +0000 (21:57 +0000)
committerMichael Lauer <mickey@vanille-media.de>
Tue, 10 Jul 2007 21:57:23 +0000 (21:57 +0000)
commitf6cb8f55812b954a8964b56e6c872df9cc39e7cd
tree2e7a17a37f444aca52a869ae38b132e907027dc8
parent0de0a257a21d04a65147eee888d4ea6be84b71a3
parent5162313734c25d73e114c540f3ad811523fedaac
Merge ... '1de364fbbc0efdbe8f12facadb69f65193d6402b'
     and '9a6a3b6cdbc4ad0d70f25990c813207b33b2a5a2'