merge of '7e6adf2eba691057299d67aeff9562e39132c566'
authorMichael Lauer <mickey@vanille-media.de>
Fri, 6 Jul 2007 12:14:34 +0000 (12:14 +0000)
committerMichael Lauer <mickey@vanille-media.de>
Fri, 6 Jul 2007 12:14:34 +0000 (12:14 +0000)
     and '87a802e7da1ecadc7269191d43d5c0434062ef8d'


Trivial merge