merge of '85bef9cf2a4d932a8fbf47debbef8a63813c0ee2'
authorCliff Brake <cbrake@bec-systems.com>
Fri, 5 Oct 2007 13:18:02 +0000 (13:18 +0000)
committerCliff Brake <cbrake@bec-systems.com>
Fri, 5 Oct 2007 13:18:02 +0000 (13:18 +0000)
     and 'ffbbde7aaaeef406e447de0ac0ebac56b9ed4157'


Trivial merge