merge of '409a4420e74feeb71713c8fa1d853dfa021daf3f'
authorMichael Lauer <mickey@vanille-media.de>
Tue, 19 Feb 2008 13:05:11 +0000 (13:05 +0000)
committerMichael Lauer <mickey@vanille-media.de>
Tue, 19 Feb 2008 13:05:11 +0000 (13:05 +0000)
commit1002ecf7a0d2dc67fd3966d32462753bd3da18d4
treeeb0a4b3638ae61cc78dfb9734179c6eb2e2f7a2a
parent394537d89c0118bf2103ea4edbf5495bf6981a55
parent8d1ca488e9ffa8ed7540c2f3dd5b8592ce619150
Merge ... '409a4420e74feeb71713c8fa1d853dfa021daf3f'
     and '538e4bfaca216445bb346ce8d4d110161a06c902'