merge of '428eab538ab77c581942526cf527bffaa81ffa40'
authorMatthias Hentges <oe@hentges.net>
Sat, 10 Mar 2007 00:10:45 +0000 (00:10 +0000)
committerMatthias Hentges <oe@hentges.net>
Sat, 10 Mar 2007 00:10:45 +0000 (00:10 +0000)
     and '8dfef8422808f2f606cab4675e792834f2f3e972'


Trivial merge