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)
commit2f58bb1398ec45127536ade3ea969ac77fda8318
treef0b884932ddaf35f476046c3411a897129c85051
parent35ee5cc80542c5d6f1edcf7e2e7a3c9841cb6403
parentc5e25db9e76a5c8a2964dac494f1e4ebd08a14e7
merge of 83d0e48aed0ad37c789536151c11fe1ee96e68c6
     and e7d24f7f731de72cf1c6a2dd55f36590d951f3b4