merge of '8d1228f600311d595e28d93dbd659249596b54c0'
authorTodd Blumer <todd@sdgsystems.com>
Sat, 21 Jul 2007 11:19:29 +0000 (11:19 +0000)
committerTodd Blumer <todd@sdgsystems.com>
Sat, 21 Jul 2007 11:19:29 +0000 (11:19 +0000)
     and '9232e3b36eb813d12d27e731841b2bad5b639846'


Trivial merge