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)
commit281e31e88a5958f8d22ade40fd7f1713a470f7c3
tree5cebf63b74705ba6cf4ce71074d26cb1cf1a16f7
parentd242abb918f10cbe2b51390c35fa311e9083f542
parent507393ba034afcd7abca0a0be584b17a4f86daa5
Merge ... '812ef7daa38cb7e71c9e1bb3ef0358566d20c3ee'
     and 'a772b6bc0f51e8c371cc638bb29f215e00e02bc5'