merge of '9ebe19c38b13611632684c440b048e45471bf916'
authorCliff Brake <cbrake@bec-systems.com>
Mon, 13 Nov 2006 18:57:30 +0000 (18:57 +0000)
committerCliff Brake <cbrake@bec-systems.com>
Mon, 13 Nov 2006 18:57:30 +0000 (18:57 +0000)
     and 'e0d42dfa54011bb501a5a723ec0554c757bfc933'


Trivial merge