merge of '2f09abb6c6399a0d986a8e19fb17a4bb638c1538'
authorMichael Lauer <mickey@vanille-media.de>
Fri, 8 Feb 2008 15:00:05 +0000 (15:00 +0000)
committerMichael Lauer <mickey@vanille-media.de>
Fri, 8 Feb 2008 15:00:05 +0000 (15:00 +0000)
     and 'db558f5b7717eef3e8d6dd412de064984daa043f'


Trivial merge