merge of '7bd228fcb04f96a616bd3711f0d5df582a2a71ec'
authorMike Westerhof <mwester@dls.net>
Sun, 24 Aug 2008 23:55:23 +0000 (23:55 +0000)
committerMike Westerhof <mwester@dls.net>
Sun, 24 Aug 2008 23:55:23 +0000 (23:55 +0000)
     and '87d13abecb09be358ba331b4193cf76bdd2bda3d'


Trivial merge