merge of 'a9a7321beaf9167825449473ccc62d83ef88fcbc'
authorMatthias Hentges <oe@hentges.net>
Sun, 3 Jun 2007 16:16:51 +0000 (16:16 +0000)
committerMatthias Hentges <oe@hentges.net>
Sun, 3 Jun 2007 16:16:51 +0000 (16:16 +0000)
     and 'db7ab9687d89ea26ca2cf47fa7e8eb2738e68ab0'


Trivial merge