merge of '0b2dabb8c740a97651ade85ebd22e45a68907b71'
authorCliff Brake <cbrake@bec-systems.com>
Wed, 17 Oct 2007 16:39:25 +0000 (16:39 +0000)
committerCliff Brake <cbrake@bec-systems.com>
Wed, 17 Oct 2007 16:39:25 +0000 (16:39 +0000)
     and '6d41cbbcfd55a1c4de32be2735ffd51c4787e9ac'


Trivial merge