merge of '2df396d3c9bb3f2afb58c9ecb59aba197323bf87'
authorMatthias Hentges <oe@hentges.net>
Sat, 5 Jan 2008 20:38:16 +0000 (20:38 +0000)
committerMatthias Hentges <oe@hentges.net>
Sat, 5 Jan 2008 20:38:16 +0000 (20:38 +0000)
     and '9bda98155004c06ada379ea6494e26df0e41c6fe'


Trivial merge