merge of 'b8b628bfe4824f594298abb40c7545cefd3aa41a'
authorMatthias Hentges <oe@hentges.net>
Tue, 26 Jun 2007 01:04:41 +0000 (01:04 +0000)
committerMatthias Hentges <oe@hentges.net>
Tue, 26 Jun 2007 01:04:41 +0000 (01:04 +0000)
commit67545feffd225b87b2873fe1474cd58185a868e0
treef8f2929702f92f7dcf226b131e1efd478f35e8e6
parentcf5c9e16ff1c80cef8f6fec18653b0ea7ababb58
parent1bf9d5f316f7cffb54caa9a3f5837c691321095f
Merge ... 'b8b628bfe4824f594298abb40c7545cefd3aa41a'
     and 'd2b977e2b47520e4d1f916319fbbf8f5f7202b7c'