merge of '8d612652f6f73c5720cff0a8820757b036cf5d26'
authorMatthias Hentges <oe@hentges.net>
Sun, 23 Dec 2007 16:25:40 +0000 (16:25 +0000)
committerMatthias Hentges <oe@hentges.net>
Sun, 23 Dec 2007 16:25:40 +0000 (16:25 +0000)
     and 'aa5081b608a304952b8206352eacb9effc61db7e'


Trivial merge