merge of '30f615c65861e2aeac9bcd31565276b2d5929532'
authorMartin Dietze <di@fh-wedel.de>
Fri, 27 Apr 2007 09:07:30 +0000 (09:07 +0000)
committerMartin Dietze <di@fh-wedel.de>
Fri, 27 Apr 2007 09:07:30 +0000 (09:07 +0000)
     and '3267272c84aca4cba0b1f3d43c934a2d3be05af4'


Trivial merge