merge of 'cea642eee26bd3cdd008cf21f1e1aad4ecfd69e6'
authorMatthias Hentges <oe@hentges.net>
Tue, 3 Apr 2007 22:30:38 +0000 (22:30 +0000)
committerMatthias Hentges <oe@hentges.net>
Tue, 3 Apr 2007 22:30:38 +0000 (22:30 +0000)
     and 'ed8e2ec8e4ff4e211f917668a777c30d09f41c6f'


Trivial merge