merge of 'a716072bb40b66870ec9797e151cda776beacf6c'
authorMatthias Hentges <oe@hentges.net>
Sat, 30 Jun 2007 15:04:16 +0000 (15:04 +0000)
committerMatthias Hentges <oe@hentges.net>
Sat, 30 Jun 2007 15:04:16 +0000 (15:04 +0000)
     and 'b3615d69f6416b196ef0183e2864d4289292a007'


Trivial merge