merge of '302d6092c09d8a1b6e5ada2cf66d444d001796b5'
authorMatthias Hentges <oe@hentges.net>
Fri, 30 Mar 2007 22:46:54 +0000 (22:46 +0000)
committerMatthias Hentges <oe@hentges.net>
Fri, 30 Mar 2007 22:46:54 +0000 (22:46 +0000)
commit25b8780a6fdda41cdd6a409e64daff512a8d00a5
tree69f9eba988f4f0613a6f09294a49691e26f0750f
parent39886a956b7f240f604b2f71cfaea294276f40b9
parent5ed24bd44de3235edcb3ef2704d70de610fc1878
Merge ... '302d6092c09d8a1b6e5ada2cf66d444d001796b5'
     and '5075b3f69144c8ca977abda48869d41f724d1334'