merge of '2620a9b57f6ef565cef134f6a34c2a51381ac2e3'
authorMartin Dietze <di@fh-wedel.de>
Wed, 18 Apr 2007 17:14:11 +0000 (17:14 +0000)
committerMartin Dietze <di@fh-wedel.de>
Wed, 18 Apr 2007 17:14:11 +0000 (17:14 +0000)
     and '29e9fec80f07c69a19d9942792954c2d692e7d13'


Trivial merge