merge of '1a467a7ea8dfd7463354c140383975aa0b8b20e8'
authorCliff Brake <cbrake@bec-systems.com>
Sat, 26 Apr 2008 13:35:22 +0000 (13:35 +0000)
committerCliff Brake <cbrake@bec-systems.com>
Sat, 26 Apr 2008 13:35:22 +0000 (13:35 +0000)
     and '60d4d904e10f8212b1c2242377b31ccc2e29e374'


Trivial merge