merge of '52a6d55e272aa56689f2387c7c4321d72814b233'
authorMartin Dietze <di@fh-wedel.de>
Thu, 2 Nov 2006 14:01:03 +0000 (14:01 +0000)
committerMartin Dietze <di@fh-wedel.de>
Thu, 2 Nov 2006 14:01:03 +0000 (14:01 +0000)
     and 'f7f6b0cbdf5cd009306c5467075a9f19734a4da3'


Trivial merge