merge of '32cafe5ca6724aa6333ef32aa6a5604b86123925'
authorMatthias Hentges <oe@hentges.net>
Sat, 5 Jan 2008 13:35:51 +0000 (13:35 +0000)
committerMatthias Hentges <oe@hentges.net>
Sat, 5 Jan 2008 13:35:51 +0000 (13:35 +0000)
     and '8efc63b43d352dc8bc16998f5461a0649ac0a66d'


Trivial merge