merge of '9b11d89eb867c4452963750a9d48fa45c70d0de6'
authorCliff Brake <cbrake@bec-systems.com>
Wed, 3 Oct 2007 01:05:00 +0000 (01:05 +0000)
committerCliff Brake <cbrake@bec-systems.com>
Wed, 3 Oct 2007 01:05:00 +0000 (01:05 +0000)
     and 'd3bdc1b5bee60534f5a4180d1fb74d09b59c68a4'


Trivial merge