merge of 'ea367d406c83c35493f3e8c93c52fad15e9eac1e'
authorHenning Heinold <heinold@inf.fu-berlin.de>
Wed, 8 Oct 2008 21:33:57 +0000 (21:33 +0000)
committerHenning Heinold <heinold@inf.fu-berlin.de>
Wed, 8 Oct 2008 21:33:57 +0000 (21:33 +0000)
     and 'f2ebdb1826372581987a96a662d30d97b544c438'


Trivial merge