merge of '23dabd48de15b4db8e9daecccce9ba8abe833091'
authorCliff Brake <cbrake@bec-systems.com>
Wed, 7 Feb 2007 20:01:14 +0000 (20:01 +0000)
committerCliff Brake <cbrake@bec-systems.com>
Wed, 7 Feb 2007 20:01:14 +0000 (20:01 +0000)
     and '99e5a9f4390d24184ef4abe7104e01db61c3b431'


Trivial merge