merge of '345e8a8f2ff4e1eb4b806053856f075bf111a801'
authorCliff Brake <cbrake@bec-systems.com>
Thu, 19 Oct 2006 20:09:55 +0000 (20:09 +0000)
committerCliff Brake <cbrake@bec-systems.com>
Thu, 19 Oct 2006 20:09:55 +0000 (20:09 +0000)
     and 'b1cace7bd8dc05cf34a5ca296aae672c7c4cbcd2'


Trivial merge