merge of '5973cff7074d3746ce1b548caf58e7dd6aae2826'
authorMatt Reimer <mattjreimer@gmail.com>
Fri, 1 Sep 2006 19:08:29 +0000 (19:08 +0000)
committerMatt Reimer <mattjreimer@gmail.com>
Fri, 1 Sep 2006 19:08:29 +0000 (19:08 +0000)
     and '9c307d34e162395d96ddb6e808059ea8c3361f74'


Trivial merge