merge of 'a938b4c71ba294501c06bafd379472de8bf9458e'
authorMatthias Hentges <oe@hentges.net>
Mon, 19 Nov 2007 17:00:41 +0000 (17:00 +0000)
committerMatthias Hentges <oe@hentges.net>
Mon, 19 Nov 2007 17:00:41 +0000 (17:00 +0000)
     and 'd0ce51a2e141b6101beacdff037b4401d8e4c275'


Trivial merge