merge of '52e45ab9ac04b6e0fc8487939269a87d0a38767e'
authorMatthias Hentges <oe@hentges.net>
Sat, 22 Dec 2007 15:00:45 +0000 (15:00 +0000)
committerMatthias Hentges <oe@hentges.net>
Sat, 22 Dec 2007 15:00:45 +0000 (15:00 +0000)
     and '953ff27ba96a0d68f716e6a8cd6caff3537e2f41'


Trivial merge