merge of '33ef958347850ae3830b2326a4476282484717bd'
authorMatthias Hentges <oe@hentges.net>
Fri, 30 Mar 2007 01:56:04 +0000 (01:56 +0000)
committerMatthias Hentges <oe@hentges.net>
Fri, 30 Mar 2007 01:56:04 +0000 (01:56 +0000)
     and 'a993414662b9e874bc71eb537e9c52822de9098f'


Trivial merge