merge of '01a1687d6a3a1aa8b8ba912066a682526987fd4f'
authorHenning Heinold <heinold@inf.fu-berlin.de>
Thu, 22 Nov 2007 21:15:54 +0000 (21:15 +0000)
committerHenning Heinold <heinold@inf.fu-berlin.de>
Thu, 22 Nov 2007 21:15:54 +0000 (21:15 +0000)
     and '74f9f9386f21c9cc7120b518b57aa3e7dee84477'


Trivial merge