merge of '67dbe8b946b7e61ce8c584272ff315f0a7b698d2'
authorTodd Blumer <todd@sdgsystems.com>
Fri, 20 Jul 2007 20:12:53 +0000 (20:12 +0000)
committerTodd Blumer <todd@sdgsystems.com>
Fri, 20 Jul 2007 20:12:53 +0000 (20:12 +0000)
     and '7d9e3c0371703df6cb39dcdb41d1d9131946eb1e'


Trivial merge