merge of '2e1d9e05c5b3d9382dab5905a71f66a069c6915d'
authorMatthias Hentges <oe@hentges.net>
Thu, 24 May 2007 17:06:27 +0000 (17:06 +0000)
committerMatthias Hentges <oe@hentges.net>
Thu, 24 May 2007 17:06:27 +0000 (17:06 +0000)
     and '6f3630e0c94aef5b64cc3ea808814c67c4fb0fd1'


Trivial merge