merge of '7a3bad457105ec40106bf5bc6341dfc5906a0088'
authorMatthias Hentges <oe@hentges.net>
Sat, 5 Jan 2008 16:45:13 +0000 (16:45 +0000)
committerMatthias Hentges <oe@hentges.net>
Sat, 5 Jan 2008 16:45:13 +0000 (16:45 +0000)
     and 'a97c52f271b18a7c7146382c7acc35a108bda245'


Trivial merge