merge of '18a264d6f6c878ae9877038ba82d3bbddafaab18'
authorHenning Heinold <heinold@inf.fu-berlin.de>
Wed, 22 Aug 2007 08:39:25 +0000 (08:39 +0000)
committerHenning Heinold <heinold@inf.fu-berlin.de>
Wed, 22 Aug 2007 08:39:25 +0000 (08:39 +0000)
     and '366af8b1769c4db47736532d047cb4d4dc1ce9dc'


Trivial merge