merge of 'c49be42499a8281e021296da447021b3145791d0'
authorMichael Lauer <mickey@vanille-media.de>
Thu, 21 Jun 2007 09:44:36 +0000 (09:44 +0000)
committerMichael Lauer <mickey@vanille-media.de>
Thu, 21 Jun 2007 09:44:36 +0000 (09:44 +0000)
     and 'd1eed5f4580f0335a30026b7fe1b92390e3312dd'


Trivial merge