merge of '466c8b9e91ad4ef8b12d3e05578482072dcaec1b'
authorHenning Heinold <heinold@inf.fu-berlin.de>
Tue, 14 Aug 2007 21:57:08 +0000 (21:57 +0000)
committerHenning Heinold <heinold@inf.fu-berlin.de>
Tue, 14 Aug 2007 21:57:08 +0000 (21:57 +0000)
     and '4d2a973ba5459115ffe04bca3dfe369dc364c77e'


Trivial merge