merge of '812ef7daa38cb7e71c9e1bb3ef0358566d20c3ee'
authorMatthias Hentges <oe@hentges.net>
Thu, 29 Nov 2007 21:51:48 +0000 (21:51 +0000)
committerMatthias Hentges <oe@hentges.net>
Thu, 29 Nov 2007 21:51:48 +0000 (21:51 +0000)
     and 'a772b6bc0f51e8c371cc638bb29f215e00e02bc5'


Trivial merge