merge of '51181b2162a577bd188446458dc9adf512663dbb'
authorMatthias Hentges <oe@hentges.net>
Sun, 23 Dec 2007 20:55:21 +0000 (20:55 +0000)
committerMatthias Hentges <oe@hentges.net>
Sun, 23 Dec 2007 20:55:21 +0000 (20:55 +0000)
     and '9ffdda8ecbc743d98577c1b644c269dee54109e0'


Trivial merge