merge of '7bc7d5c3532bb5efc024410e9d74cc23ebeb80c4'
authorMatthias Hentges <oe@hentges.net>
Sat, 9 Jun 2007 21:54:47 +0000 (21:54 +0000)
committerMatthias Hentges <oe@hentges.net>
Sat, 9 Jun 2007 21:54:47 +0000 (21:54 +0000)
     and 'adf85b1ec40339e44983ef65acf414d9ad5ed6a4'


Trivial merge