merge of 'ebb880278ddb813fb7b527d822caeb57adc81179'
authorHenning Heinold <heinold@inf.fu-berlin.de>
Fri, 6 Jul 2007 16:45:44 +0000 (16:45 +0000)
committerHenning Heinold <heinold@inf.fu-berlin.de>
Fri, 6 Jul 2007 16:45:44 +0000 (16:45 +0000)
     and 'fa76ecef37e2cdf7add00cf988b60dd14eeff878'


Trivial merge