merge of '48478ddf3ddc9dfe86e795c161215a6aff7bed14'
authorMatthias Hentges <oe@hentges.net>
Sun, 25 Nov 2007 22:21:39 +0000 (22:21 +0000)
committerMatthias Hentges <oe@hentges.net>
Sun, 25 Nov 2007 22:21:39 +0000 (22:21 +0000)
     and '5902c8a2faa615298afe02583b6cc1c6fdc96b8c'


Trivial merge