merge of '2c22bea4b2d6d4e0ad169b4d539960696bad4584'
authorCliff Brake <cbrake@bec-systems.com>
Wed, 4 Apr 2007 12:44:42 +0000 (12:44 +0000)
committerCliff Brake <cbrake@bec-systems.com>
Wed, 4 Apr 2007 12:44:42 +0000 (12:44 +0000)
     and '5311d4b9d0be287a93d341e3dc0033e380cf3cb2'


Trivial merge