merge of '6b1d2d29b75614981eb6f61a01a5e5ccf2a065f1'
authorMartin Dietze <di@fh-wedel.de>
Fri, 8 Sep 2006 13:18:53 +0000 (13:18 +0000)
committerMartin Dietze <di@fh-wedel.de>
Fri, 8 Sep 2006 13:18:53 +0000 (13:18 +0000)
     and 'e469bf244bad64c70f8175ad971b2d9a83365bec'


Trivial merge