merge of '8c882ebf352023c6daf9ea756d94b90aef6d21ba'
authorHenning Heinold <heinold@inf.fu-berlin.de>
Fri, 6 Jun 2008 14:40:04 +0000 (14:40 +0000)
committerHenning Heinold <heinold@inf.fu-berlin.de>
Fri, 6 Jun 2008 14:40:04 +0000 (14:40 +0000)
     and 'e39129641bd214aff1dd438b4331a2f1531ca1cc'


Trivial merge