merge of '79b90d4ef7df69035b001466908501f67f8aac76'
authorMike Westerhof <mwester@dls.net>
Mon, 8 Sep 2008 06:07:20 +0000 (06:07 +0000)
committerMike Westerhof <mwester@dls.net>
Mon, 8 Sep 2008 06:07:20 +0000 (06:07 +0000)
     and '81a14649e513b12b58d75276170ffa386580f244'


Trivial merge