merge of '3560960febd8121cf7263cd584a42d62985d8f26'
authorMatthias Hentges <oe@hentges.net>
Sat, 3 Mar 2007 20:35:50 +0000 (20:35 +0000)
committerMatthias Hentges <oe@hentges.net>
Sat, 3 Mar 2007 20:35:50 +0000 (20:35 +0000)
     and '6f4fc206c5fe4f18b5ae29f55f8e1487a5c22623'


Trivial merge