merge of '34aab52ad6f5f23f024db0327f33a822b205c50f'
authorMatthias Hentges <oe@hentges.net>
Tue, 20 Nov 2007 00:02:02 +0000 (00:02 +0000)
committerMatthias Hentges <oe@hentges.net>
Tue, 20 Nov 2007 00:02:02 +0000 (00:02 +0000)
     and '7474dc274cd34419f2c76088f150e44ce8b545df'


Trivial merge