merge of '130c4c25e5d2d96f1ac7b74c68405c8a6e8b764d'
authorMike Westerhof <mwester@dls.net>
Mon, 2 Jul 2007 17:06:10 +0000 (17:06 +0000)
committerMike Westerhof <mwester@dls.net>
Mon, 2 Jul 2007 17:06:10 +0000 (17:06 +0000)
     and 'b783e6b6c66f2dedfc04da8ff6b9b748752c7400'


Trivial merge