merge of '19bacabe62a70bf0818d663c4cd3bc168e5cf49e'
authorMatthias Hentges <oe@hentges.net>
Thu, 29 Nov 2007 21:52:01 +0000 (21:52 +0000)
committerMatthias Hentges <oe@hentges.net>
Thu, 29 Nov 2007 21:52:01 +0000 (21:52 +0000)
     and '332e97250454514e2c07aea9f1695ab21166d191'


Trivial merge