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)
     and '9a6a3b6cdbc4ad0d70f25990c813207b33b2a5a2'


Trivial merge