merge of '3828ccf554f5383a7feb13d09fe0f6e67073ef53'
authorMike Westerhof <mwester@dls.net>
Mon, 4 Feb 2008 17:23:41 +0000 (17:23 +0000)
committerMike Westerhof <mwester@dls.net>
Mon, 4 Feb 2008 17:23:41 +0000 (17:23 +0000)
     and 'cf5abc7766faffd221ece62edef44865e099d55f'


Trivial merge