merge of '027a24a67d7f612e0e7b0f9f748d81e6a8e018ba'
authorMichael Lauer <mickey@vanille-media.de>
Sun, 13 Apr 2008 12:06:08 +0000 (12:06 +0000)
committerMichael Lauer <mickey@vanille-media.de>
Sun, 13 Apr 2008 12:06:08 +0000 (12:06 +0000)
     and '2129627862caba2989adc92ac7743bda23d46fe0'


Trivial merge