merge of '4ea5a9aef34545de02877a14b307a17a78e03939'
authorCliff Brake <cbrake@bec-systems.com>
Wed, 3 Oct 2007 17:08:10 +0000 (17:08 +0000)
committerCliff Brake <cbrake@bec-systems.com>
Wed, 3 Oct 2007 17:08:10 +0000 (17:08 +0000)
     and '886aada8adfc803f178de9d934a313ed503451e9'


Trivial merge