merge of '7ddcf7aeb14743db7aec16e7be026e81dd7d1b38'
authorHenning Heinold <heinold@inf.fu-berlin.de>
Fri, 18 Jul 2008 12:47:56 +0000 (12:47 +0000)
committerHenning Heinold <heinold@inf.fu-berlin.de>
Fri, 18 Jul 2008 12:47:56 +0000 (12:47 +0000)
     and '833293633b1a1f924ee4ba4f8e442c032d9cd133'


Trivial merge