merge of 'd1d1db9026fcb0ce740b8c243f2bfc92eeac4c5d'
authorMichael Lauer <mickey@vanille-media.de>
Wed, 15 Aug 2007 21:13:33 +0000 (21:13 +0000)
committerMichael Lauer <mickey@vanille-media.de>
Wed, 15 Aug 2007 21:13:33 +0000 (21:13 +0000)
     and 'd969b9d6bcaf1b8db0c0e85d4ce95524a579055b'


Trivial merge