merge of '1909baf9ab12a452e81ce3457dd41c34cd9be405'
authorMike Westerhof <mwester@dls.net>
Sun, 31 Dec 2006 05:45:08 +0000 (05:45 +0000)
committerMike Westerhof <mwester@dls.net>
Sun, 31 Dec 2006 05:45:08 +0000 (05:45 +0000)
     and '6fb89b000058fcb8dd2eb81e04657d6f20f86708'


Trivial merge