merge of 'a7c105926e0b0083886d25095383bca3bee3f6b9'
authorCliff Brake <cbrake@bec-systems.com>
Sat, 6 Jan 2007 20:40:57 +0000 (20:40 +0000)
committerCliff Brake <cbrake@bec-systems.com>
Sat, 6 Jan 2007 20:40:57 +0000 (20:40 +0000)
     and 'a88c6575a760656e837fbfbb6bdcf2784ac0bf3f'


Trivial merge