merge of '3f7c924df24e54d34133232f41e48dd253227542'
authorMike Westerhof <mwester@dls.net>
Fri, 28 Mar 2008 06:01:41 +0000 (06:01 +0000)
committerMike Westerhof <mwester@dls.net>
Fri, 28 Mar 2008 06:01:41 +0000 (06:01 +0000)
     and '53456ed8edb2c9fe305ce7764182d17d7c84e129'


Trivial merge