merge of '4a394f7770c7d370e3ad0bf4e77cb2288e195180'
authorMike Westerhof <mwester@dls.net>
Tue, 2 Jan 2007 23:44:13 +0000 (23:44 +0000)
committerMike Westerhof <mwester@dls.net>
Tue, 2 Jan 2007 23:44:13 +0000 (23:44 +0000)
     and '79b37f286afab909bc3f1f60b70ee2f4b2b54cbb'


Trivial merge