merge of '14a701971b9cd67faba4766a17dd244b687d08a1'
authorHenning Heinold <heinold@inf.fu-berlin.de>
Sat, 7 Jul 2007 16:04:36 +0000 (16:04 +0000)
committerHenning Heinold <heinold@inf.fu-berlin.de>
Sat, 7 Jul 2007 16:04:36 +0000 (16:04 +0000)
     and '69457e2ded5426f232837433da27883e41e78e5a'


Trivial merge