merge of '56608badb3c66e42a7caddfbac78081041eb2557'
authorMike Westerhof <mwester@dls.net>
Sun, 24 Dec 2006 19:12:06 +0000 (19:12 +0000)
committerMike Westerhof <mwester@dls.net>
Sun, 24 Dec 2006 19:12:06 +0000 (19:12 +0000)
     and 'a3ab5903c2c74cd3642d81725e59591a9c7cfb54'


Trivial merge