merge of '0381c9ad641381550f893b4d8ecce3dbcb564f35'
authorHenning Heinold <heinold@inf.fu-berlin.de>
Thu, 25 Sep 2008 20:11:06 +0000 (20:11 +0000)
committerHenning Heinold <heinold@inf.fu-berlin.de>
Thu, 25 Sep 2008 20:11:06 +0000 (20:11 +0000)
     and '1262079695145ac6560bcf70b9c0508b15f87e4d'


Trivial merge