merge of 'a07d4d282b6b37f678fc49a34df91913a6091590'
authorMichael Lauer <mickey@vanille-media.de>
Mon, 10 Mar 2008 20:17:32 +0000 (20:17 +0000)
committerMichael Lauer <mickey@vanille-media.de>
Mon, 10 Mar 2008 20:17:32 +0000 (20:17 +0000)
     and 'ca9bc5017aabbeb9a9266eeaf1f812f66b7956fc'


Trivial merge