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)
commit85cadd8dd8537540f27429c10852e29d4cdae6cf
tree61b03b9de6deda7baef9b0e8861f1fc7e2d69df7
parentcdcc825f5cb18922289afe3a50d5be19a47d8d04
parent154b49c75d9058b9904986cc1d0f2913a7ce6388
Merge ... 'a938b4c71ba294501c06bafd379472de8bf9458e'
     and 'd0ce51a2e141b6101beacdff037b4401d8e4c275'