merge of '27501039f4773e7f3b2142998ee04c9f71c6fa20'
authorMatthias Hentges <oe@hentges.net>
Tue, 7 Nov 2006 23:00:53 +0000 (23:00 +0000)
committerMatthias Hentges <oe@hentges.net>
Tue, 7 Nov 2006 23:00:53 +0000 (23:00 +0000)
commit69a0ace742daf5e56cc089852f19201cbf88349e
tree4e95f917cc2ad6c1ef7dfe1c87892a1630f373c1
parentdcd47fba440071a9a0546cfd1c8969f6388fbdf0
parentfe5500283a831c44d5226f91fd9f3693241898a5
Merge ... '27501039f4773e7f3b2142998ee04c9f71c6fa20'
     and '933fe37d02e3d6def58e43b926be13c580634799'