merge of '0f87f8be24df03c0a122d734a9d28e61cdacd4b4'
authorMatthias Hentges <oe@hentges.net>
Mon, 27 Nov 2006 20:30:14 +0000 (20:30 +0000)
committerMatthias Hentges <oe@hentges.net>
Mon, 27 Nov 2006 20:30:14 +0000 (20:30 +0000)
     and '9bac02feed3274bd39118581192521e56ce97898'


Trivial merge