merge of '7ccd015112b8aa69fbfe95acc1893ca13ac30992'
authorCliff Brake <cbrake@bec-systems.com>
Mon, 11 Dec 2006 15:28:13 +0000 (15:28 +0000)
committerCliff Brake <cbrake@bec-systems.com>
Mon, 11 Dec 2006 15:28:13 +0000 (15:28 +0000)
     and 'f1d7476860f569e3fa2e97db12daf5c4513332f8'


Trivial merge