merge of '21c10a8f6d8fab5386df94e29b38d5428ca259bb'
authorMatthias Hentges <oe@hentges.net>
Wed, 20 Jun 2007 01:22:08 +0000 (01:22 +0000)
committerMatthias Hentges <oe@hentges.net>
Wed, 20 Jun 2007 01:22:08 +0000 (01:22 +0000)
     and 'fa82b84114aa44a8ce522b1f4d5e6e017c7c38f4'


Trivial merge