merge of '700ee409f8ee36c40f4c50e4ce581e1d11fd5fa0'
authorMatthias Hentges <oe@hentges.net>
Sat, 22 Dec 2007 15:02:05 +0000 (15:02 +0000)
committerMatthias Hentges <oe@hentges.net>
Sat, 22 Dec 2007 15:02:05 +0000 (15:02 +0000)
     and 'b9d02215b2fc8567ca9440f96665d1645ec21d56'


Trivial merge