merge of '561789101197a1ad79583108a323b4d89e6b24a7'
authorMichael Lauer <mickey@vanille-media.de>
Tue, 19 Sep 2006 16:33:35 +0000 (16:33 +0000)
committerMichael Lauer <mickey@vanille-media.de>
Tue, 19 Sep 2006 16:33:35 +0000 (16:33 +0000)
     and '74f8449b82f8cdc938444eddae96bdd31fc4e413'


Trivial merge