merge of '1b97b6566e1ae9dd18335c287469a817078fbb10'
authorCliff Brake <cbrake@bec-systems.com>
Wed, 3 Jan 2007 12:51:20 +0000 (12:51 +0000)
committerCliff Brake <cbrake@bec-systems.com>
Wed, 3 Jan 2007 12:51:20 +0000 (12:51 +0000)
     and '2f655855e9cd21f0db11577a04d65162273a4b1c'


Trivial merge