merge of 8cfd2f59fa869bd625b9828d6c59bc1d16c978b7
authorMichael Lauer <mickey@vanille-media.de>
Tue, 31 Oct 2006 15:55:22 +0000 (15:55 +0000)
committerMichael Lauer <mickey@vanille-media.de>
Tue, 31 Oct 2006 15:55:22 +0000 (15:55 +0000)
     and d15257c6860636c9adea74d3e113bba72cd9e811


Trivial merge