merge of 497af8d916ea71b5cc3ad879076fb96fd89b3ef9
authorMichael Lauer <mickey@vanille-media.de>
Thu, 19 Oct 2006 12:14:13 +0000 (12:14 +0000)
committerMichael Lauer <mickey@vanille-media.de>
Thu, 19 Oct 2006 12:14:13 +0000 (12:14 +0000)
     and 4f4c1c975d8e241b60c1c145634b54180f6f1fb9


Trivial merge