merge of '958bac4da4de63f8fadb3d84361a07eee1bd3246'
authorMichael Lauer <mickey@vanille-media.de>
Sat, 25 Aug 2007 23:52:48 +0000 (23:52 +0000)
committerMichael Lauer <mickey@vanille-media.de>
Sat, 25 Aug 2007 23:52:48 +0000 (23:52 +0000)
     and 'f4021a8051081d380813f73eed127182fda51b45'


Trivial merge