merge of '4c3e95612d7e11dff6afb443db21824d2266449b'
authorHenning Heinold <heinold@inf.fu-berlin.de>
Thu, 17 Jul 2008 19:40:17 +0000 (19:40 +0000)
committerHenning Heinold <heinold@inf.fu-berlin.de>
Thu, 17 Jul 2008 19:40:17 +0000 (19:40 +0000)
     and 'e07ea8506d3c48b797607d8f49339c4ac605d045'


Trivial merge