merge of '48478ddf3ddc9dfe86e795c161215a6aff7bed14'
authorMatthias Hentges <oe@hentges.net>
Sun, 25 Nov 2007 22:21:39 +0000 (22:21 +0000)
committerMatthias Hentges <oe@hentges.net>
Sun, 25 Nov 2007 22:21:39 +0000 (22:21 +0000)
commit82ac8f234febee9091a8180d28fc6c260db1ca1f
tree35e659e21fbf18253976d5938b385d9dea984ddd
parentfbeb13865c479ad6af0bb4a76dd6e7b3baec44db
parenta3b04783b2e084437fad195348240a49ac5d4873
Merge ... '48478ddf3ddc9dfe86e795c161215a6aff7bed14'
     and '5902c8a2faa615298afe02583b6cc1c6fdc96b8c'