merge of '65fefd8b14862b0291239d37729964b98069c038'
authorMatthias Hentges <oe@hentges.net>
Thu, 27 Dec 2007 21:37:31 +0000 (21:37 +0000)
committerMatthias Hentges <oe@hentges.net>
Thu, 27 Dec 2007 21:37:31 +0000 (21:37 +0000)
commit807d2d6d72975b2de4bc47940004f792b39b7c94
tree4e42476229a92c9e18a846d806dce14a57a1bcac
parentc8ba91fe350a5b56d46baef35470bdbbaa5edaef
parent2118494c862cc7442fda5249394b924575a6f7ca
Merge ... '65fefd8b14862b0291239d37729964b98069c038'
     and 'fbb56d5a76093891efdc7abc682059fd0436d4be'