merge of '93c76dabe575881b7335e6aca044cb6fb6aceffe'
authorMatthias Hentges <oe@hentges.net>
Tue, 5 Jun 2007 02:30:41 +0000 (02:30 +0000)
committerMatthias Hentges <oe@hentges.net>
Tue, 5 Jun 2007 02:30:41 +0000 (02:30 +0000)
     and 'fa1c000d2eb11e81b0552935ffbdfcbf497dde8a'


Trivial merge