merge of 74c6df5277dd79cbaaba08bdb441d1299119179e
authorMichael Lauer <mickey@vanille-media.de>
Tue, 14 Nov 2006 16:43:16 +0000 (16:43 +0000)
committerMichael Lauer <mickey@vanille-media.de>
Tue, 14 Nov 2006 16:43:16 +0000 (16:43 +0000)
     and f3e744d286e5596939ace0b10699542f2cc2a925


Trivial merge