merge of 83d0e48aed0ad37c789536151c11fe1ee96e68c6
authorMichael Lauer <mickey@vanille-media.de>
Tue, 12 Sep 2006 21:10:42 +0000 (21:10 +0000)
committerMichael Lauer <mickey@vanille-media.de>
Tue, 12 Sep 2006 21:10:42 +0000 (21:10 +0000)
     and e7d24f7f731de72cf1c6a2dd55f36590d951f3b4


Trivial merge