merge of '0d2fc1d280147ac623069498dbb40891375ba420'
authorHenning Heinold <heinold@inf.fu-berlin.de>
Sat, 7 Jun 2008 09:38:20 +0000 (09:38 +0000)
committerHenning Heinold <heinold@inf.fu-berlin.de>
Sat, 7 Jun 2008 09:38:20 +0000 (09:38 +0000)
     and 'b67982af950df1e834ed156c9f113061896b3d73'


Trivial merge