merge of '408bb9577367ad6566e44226f3937d1fc418625b'
authorMike Westerhof <mwester@dls.net>
Sun, 5 Nov 2006 15:10:40 +0000 (15:10 +0000)
committerMike Westerhof <mwester@dls.net>
Sun, 5 Nov 2006 15:10:40 +0000 (15:10 +0000)
     and 'a337f475bdcf6dad6cf37639f96ff8cf5f99328a'


Trivial merge