merge of '74b9e2f30013cb1f9e8090a8642900ae33d12d3e'
authorHenning Heinold <heinold@inf.fu-berlin.de>
Sun, 25 May 2008 19:04:48 +0000 (19:04 +0000)
committerHenning Heinold <heinold@inf.fu-berlin.de>
Sun, 25 May 2008 19:04:48 +0000 (19:04 +0000)
     and 'be15c58b0a9d4e7ab6b2bc0470525b44a5d5f862'


Trivial merge