merge of '9ad1a49af843883e15a66f341544aa7138eabd5c'
authorMike Westerhof <mwester@dls.net>
Fri, 16 Feb 2007 19:47:06 +0000 (19:47 +0000)
committerMike Westerhof <mwester@dls.net>
Fri, 16 Feb 2007 19:47:06 +0000 (19:47 +0000)
     and 'a8bf0677a23a474e197151ebb4c24ddbf5c65a67'


Trivial merge