merge of '6f7c6c0d226901d61dbd149693b1d376efe3b4d2'
authorHenning Heinold <heinold@inf.fu-berlin.de>
Sat, 17 May 2008 15:35:34 +0000 (15:35 +0000)
committerHenning Heinold <heinold@inf.fu-berlin.de>
Sat, 17 May 2008 15:35:34 +0000 (15:35 +0000)
     and 'bbe1f43b109ad4a796a0fb8e5edee36e28a20276'


Trivial merge