merge of '1f87c0f3663976dafd6caaabc1cf1397f48451e8'
authorMichael Lauer <mickey@vanille-media.de>
Mon, 21 Jul 2008 14:08:40 +0000 (14:08 +0000)
committerMichael Lauer <mickey@vanille-media.de>
Mon, 21 Jul 2008 14:08:40 +0000 (14:08 +0000)
     and 'ef5c7f64094e35acf78793dc2ff1cbcc408d2530'


Trivial merge