merge of '3e7e04fc7b25bc4ab1a3bd3ba12d6376801cde1a'
authorCliff Brake <cbrake@bec-systems.com>
Wed, 7 Feb 2007 20:28:49 +0000 (20:28 +0000)
committerCliff Brake <cbrake@bec-systems.com>
Wed, 7 Feb 2007 20:28:49 +0000 (20:28 +0000)
     and '3f262d1fc267738f468c1c85010e34af5fe6bf38'


Trivial merge