merge of '054216fcb27d4211cd8948d7407878afe1bbf15c'
authorMichael Lauer <mickey@vanille-media.de>
Wed, 13 Feb 2008 11:15:20 +0000 (11:15 +0000)
committerMichael Lauer <mickey@vanille-media.de>
Wed, 13 Feb 2008 11:15:20 +0000 (11:15 +0000)
     and 'f26d3059129388297f1542283ce17d100f8c8acc'


Trivial merge