merge of 08b0e7058f8944b597207b5f969021dea13443c9
authorMichael Lauer <mickey@vanille-media.de>
Fri, 25 Aug 2006 10:54:15 +0000 (10:54 +0000)
committerMichael Lauer <mickey@vanille-media.de>
Fri, 25 Aug 2006 10:54:15 +0000 (10:54 +0000)
     and d9256d2a6f06908a4b219e63c0e662263d139874


Trivial merge