merge of '36d8e178bafb50c7881d637db537e08c72510ace'
authorMike Westerhof <mwester@dls.net>
Sun, 7 Sep 2008 03:56:12 +0000 (03:56 +0000)
committerMike Westerhof <mwester@dls.net>
Sun, 7 Sep 2008 03:56:12 +0000 (03:56 +0000)
     and '409f0e4c54eb53279e57c78f8ba5c98e3fa9ceb3'


Trivial merge