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)
     and '933fe37d02e3d6def58e43b926be13c580634799'


Trivial merge