merge of 59ba4be70367579301ec86a4ace2a74be281b35d
authorMichael Lauer <mickey@vanille-media.de>
Fri, 28 Jul 2006 11:15:21 +0000 (11:15 +0000)
committerMichael Lauer <mickey@vanille-media.de>
Fri, 28 Jul 2006 11:15:21 +0000 (11:15 +0000)
     and d685f58742a33aa75bb8b913d7c9adeb338387d1


Trivial merge