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)
commit69cd4b590282088c35967213d400e480150d43c8
tree64c9ee4d04782ea4fa32d0af0ae09d40a1c1877b
parentfb1cee2982dbd566111e6dcd5766b7721583513b
parentfc3b97418571ca401dfa3fda18bbbca9d9875914
Merge ... '7bd228fcb04f96a616bd3711f0d5df582a2a71ec'
     and '87d13abecb09be358ba331b4193cf76bdd2bda3d'