merge of '53dccbcb3344fa9a96f7f2c544d3dfec1b100fca'
authorHenning Heinold <heinold@inf.fu-berlin.de>
Wed, 7 May 2008 20:07:39 +0000 (20:07 +0000)
committerHenning Heinold <heinold@inf.fu-berlin.de>
Wed, 7 May 2008 20:07:39 +0000 (20:07 +0000)
     and 'fea7dedc0a856ea56969779e97c888a16ffc63de'


Trivial merge