merge of '1007839d0212365ae91bf35580b76dac1cf35577'
authorStefan Schmidt <stefan@datenfreihafen.org>
Sat, 13 Oct 2007 03:39:08 +0000 (03:39 +0000)
committerStefan Schmidt <stefan@datenfreihafen.org>
Sat, 13 Oct 2007 03:39:08 +0000 (03:39 +0000)
     and 'c66711719c910e7fe45fef747bc4b8b9e386e54a'


Trivial merge