merge of 80d921d4eb948d68b2d65a3d93db120eae996016
authorMichael Lauer <mickey@vanille-media.de>
Sat, 25 Nov 2006 18:54:48 +0000 (18:54 +0000)
committerMichael Lauer <mickey@vanille-media.de>
Sat, 25 Nov 2006 18:54:48 +0000 (18:54 +0000)
     and 8f3baeb5bf49c339b2cc784f9f4abed635cc720e


Trivial merge