merge of a83b40dbdf522cf477298e73d789074887799468
authorMichael Lauer <mickey@vanille-media.de>
Sat, 11 Nov 2006 18:22:30 +0000 (18:22 +0000)
committerMichael Lauer <mickey@vanille-media.de>
Sat, 11 Nov 2006 18:22:30 +0000 (18:22 +0000)
     and e2fde1c5cf87c2b0a9be2dfac2a1a1937db68382


Trivial merge