merge of '43f0162e257c27b3b68e689fc1e52fc7d296db3d'
authorMichael Lauer <mickey@vanille-media.de>
Fri, 22 Jun 2007 04:11:30 +0000 (04:11 +0000)
committerMichael Lauer <mickey@vanille-media.de>
Fri, 22 Jun 2007 04:11:30 +0000 (04:11 +0000)
     and 'b1be59f70fc52177a67b15d29fc93897c548b5a8'


Trivial merge