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)
commit5f971c9d11baf069a4e7443be8eec89dcd40a1d9
tree1709613ea32c040632697bf2f6651fd0bc1b71a3
parent98c24fd9863bbcd80db9c43602d0e72d901e810e
parent28fa247ca598fad3ce28eeb342b529ee990221ff
Merge ... '0f87f8be24df03c0a122d734a9d28e61cdacd4b4'
     and '9bac02feed3274bd39118581192521e56ce97898'