merge of 'b15a72d39d751ca408617bf95b875f434f8a6377'
authorStefan Schmidt <stefan@datenfreihafen.org>
Mon, 30 Jul 2007 21:48:34 +0000 (21:48 +0000)
committerStefan Schmidt <stefan@datenfreihafen.org>
Mon, 30 Jul 2007 21:48:34 +0000 (21:48 +0000)
     and 'e96694990902ffb76becba56bab471a323fab49e'


Trivial merge