merge of 'b8b628bfe4824f594298abb40c7545cefd3aa41a'
authorMatthias Hentges <oe@hentges.net>
Tue, 26 Jun 2007 01:04:41 +0000 (01:04 +0000)
committerMatthias Hentges <oe@hentges.net>
Tue, 26 Jun 2007 01:04:41 +0000 (01:04 +0000)
     and 'd2b977e2b47520e4d1f916319fbbf8f5f7202b7c'


Trivial merge