merge of '4afe7a39abef322799f31bedff527afcc6c16d7f'
authorMatthias Hentges <oe@hentges.net>
Fri, 28 Dec 2007 16:05:31 +0000 (16:05 +0000)
committerMatthias Hentges <oe@hentges.net>
Fri, 28 Dec 2007 16:05:31 +0000 (16:05 +0000)
     and 'c9fabe80e49ddb31c5f4120c9b456c5cb1aace8c'


Trivial merge