merge of '22d90510dcdbad0d05c38bbc2984c79754336a89'
authorMatthias Hentges <oe@hentges.net>
Thu, 1 May 2008 22:03:23 +0000 (22:03 +0000)
committerMatthias Hentges <oe@hentges.net>
Thu, 1 May 2008 22:03:23 +0000 (22:03 +0000)
     and 'bdf8f6761da7188dd5e88b5096a73feb0816d6b7'


Trivial merge