merge of '7ce845adf550b64d9d2250d29acf1667cf40a689'
authorMatthias Hentges <oe@hentges.net>
Wed, 6 Jun 2007 23:39:36 +0000 (23:39 +0000)
committerMatthias Hentges <oe@hentges.net>
Wed, 6 Jun 2007 23:39:36 +0000 (23:39 +0000)
     and 'e2163ec9cea6469b87297219312db5af82e6b960'


Trivial merge