merge of 'ef57d7f9782540c734ca9342f8a136c7bbeb5074'
authorMichael Lauer <mickey@vanille-media.de>
Sun, 22 Jun 2008 11:57:04 +0000 (11:57 +0000)
committerMichael Lauer <mickey@vanille-media.de>
Sun, 22 Jun 2008 11:57:04 +0000 (11:57 +0000)
     and 'fcaa336068b9697eb2e8236103ae4865056796c1'


Trivial merge