merge of 261f8a4167761b16158724a65abdf147c333aefb
authorMichael Lauer <mickey@vanille-media.de>
Sat, 29 Jul 2006 16:04:46 +0000 (16:04 +0000)
committerMichael Lauer <mickey@vanille-media.de>
Sat, 29 Jul 2006 16:04:46 +0000 (16:04 +0000)
     and f013fa49cf51e608648d80a83a4941c4900ebfd9


Trivial merge