merge of '1e5f74b2b60986b2dbf42fbd03a69ee2a59be5a2'
authorHenning Heinold <heinold@inf.fu-berlin.de>
Sun, 12 Oct 2008 17:26:16 +0000 (17:26 +0000)
committerHenning Heinold <heinold@inf.fu-berlin.de>
Sun, 12 Oct 2008 17:26:16 +0000 (17:26 +0000)
     and 'a205d31ba30bfe2c36e1988e8e13a5dbe3399620'


Trivial merge