merge of 'a854dd28fb847bafd893da5b25effffcb1c92d50'
authorMatthias Hentges <oe@hentges.net>
Thu, 8 Mar 2007 12:26:13 +0000 (12:26 +0000)
committerMatthias Hentges <oe@hentges.net>
Thu, 8 Mar 2007 12:26:13 +0000 (12:26 +0000)
     and 'f2c871ba9da01e3efcca29b804141df45b53adb6'


Trivial merge