merge of '6159b24371b1d635546251f92f5c705343f88b30'
authorMartin Dietze <di@fh-wedel.de>
Mon, 25 Sep 2006 12:44:18 +0000 (12:44 +0000)
committerMartin Dietze <di@fh-wedel.de>
Mon, 25 Sep 2006 12:44:18 +0000 (12:44 +0000)
     and 'd6a8fb6a4dc52ff3bda0e3bf30b05a0db05377a1'


Trivial merge