merge of '8015a13e63ef13c856f4a5a5f4e9b1fa3f143fa8'
authorMatthias Hentges <oe@hentges.net>
Fri, 4 Jan 2008 14:10:51 +0000 (14:10 +0000)
committerMatthias Hentges <oe@hentges.net>
Fri, 4 Jan 2008 14:10:51 +0000 (14:10 +0000)
     and '85ea4469c6c02accbb588d6edee46fd9a00ad12d'


Trivial merge