merge of '302d6092c09d8a1b6e5ada2cf66d444d001796b5'
authorMatthias Hentges <oe@hentges.net>
Fri, 30 Mar 2007 22:46:54 +0000 (22:46 +0000)
committerMatthias Hentges <oe@hentges.net>
Fri, 30 Mar 2007 22:46:54 +0000 (22:46 +0000)
     and '5075b3f69144c8ca977abda48869d41f724d1334'


Trivial merge