merge of 'f8ad7a4bfb118867c5a5867eb5c4c2c2c74f8330'
authorMichael Lauer <mickey@vanille-media.de>
Sun, 14 Sep 2008 23:05:28 +0000 (23:05 +0000)
committerMichael Lauer <mickey@vanille-media.de>
Sun, 14 Sep 2008 23:05:28 +0000 (23:05 +0000)
     and 'f9d110b5aa39df7718381524083e62d3f8f7a5f0'


Trivial merge