merge of '4688c77d9f496fd36f6b1845f37bc3c42af85968'
authorMatthias Hentges <oe@hentges.net>
Thu, 29 Nov 2007 17:58:08 +0000 (17:58 +0000)
committerMatthias Hentges <oe@hentges.net>
Thu, 29 Nov 2007 17:58:08 +0000 (17:58 +0000)
     and 'dd83c0ba4e83a6207462418b614431ce061d9481'


Trivial merge