merge of '294a7914d9ff32527dddf5266da757d7385372e7'
authorMichael Lauer <mickey@vanille-media.de>
Fri, 10 Aug 2007 11:01:07 +0000 (11:01 +0000)
committerMichael Lauer <mickey@vanille-media.de>
Fri, 10 Aug 2007 11:01:07 +0000 (11:01 +0000)
     and '726f50fa46c4db4bf5fb2dc2f6390ca60337cdd0'


Trivial merge