merge of '577e0fae5932f28f1096d2650fe9d96fe41fd58d'
authorMichael Lauer <mickey@vanille-media.de>
Sat, 14 Oct 2006 19:23:25 +0000 (19:23 +0000)
committerMichael Lauer <mickey@vanille-media.de>
Sat, 14 Oct 2006 19:23:25 +0000 (19:23 +0000)
     and '84667dc56e1a3e43425da1c10dc836e3ea6e81f9'


Trivial merge