merge of '83df338c70f7f4819197794f3daebb64a89fcf0a'
authorMichael Lauer <mickey@vanille-media.de>
Thu, 9 Oct 2008 02:50:27 +0000 (02:50 +0000)
committerMichael Lauer <mickey@vanille-media.de>
Thu, 9 Oct 2008 02:50:27 +0000 (02:50 +0000)
     and '9f79c6b2ba1ff673c6a3fa4d02579b720046d1cf'


Trivial merge