merge of '6e8259e13dda6b19a59db6751153b5e9583486e2'
authorMichael Lauer <mickey@vanille-media.de>
Tue, 10 Jul 2007 16:41:35 +0000 (16:41 +0000)
committerMichael Lauer <mickey@vanille-media.de>
Tue, 10 Jul 2007 16:41:35 +0000 (16:41 +0000)
     and '79a8be76eb7e634035b02729b67f9179fabb8711'


Trivial merge