merge of '8d9f1c0adaea2946d1c6e57e528158c450e0a626'
authorTodd Blumer <todd@sdgsystems.com>
Fri, 20 Jul 2007 23:11:29 +0000 (23:11 +0000)
committerTodd Blumer <todd@sdgsystems.com>
Fri, 20 Jul 2007 23:11:29 +0000 (23:11 +0000)
     and '9312d5d8cc0db3acb8eb0cb2429fe1e78ff89299'


Trivial merge