merge of 'a925a41dbe7a5d17f8081a8d5a761042750ef05c'
authorMatthias Hentges <oe@hentges.net>
Thu, 3 Jan 2008 23:30:54 +0000 (23:30 +0000)
committerMatthias Hentges <oe@hentges.net>
Thu, 3 Jan 2008 23:30:54 +0000 (23:30 +0000)
     and 'abe0149045acae87e701ee34dbfee1ff0ebc71c9'


Trivial merge