merge of '77bddad5a15eedb425a97612fb10888da47c7b19'
authorHenning Heinold <heinold@inf.fu-berlin.de>
Sat, 17 May 2008 19:30:23 +0000 (19:30 +0000)
committerHenning Heinold <heinold@inf.fu-berlin.de>
Sat, 17 May 2008 19:30:23 +0000 (19:30 +0000)
     and 'e9694e67eab5656acc0305097c9945a509173ce7'


Trivial merge