merge of '68f002bfdbf7c0cfe2a043b7055f5ae81fb10a62'
authorCliff Brake <cbrake@bec-systems.com>
Tue, 19 Jun 2007 18:11:13 +0000 (18:11 +0000)
committerCliff Brake <cbrake@bec-systems.com>
Tue, 19 Jun 2007 18:11:13 +0000 (18:11 +0000)
     and 'e84ce1973d13c28e9abaac44f883e1bc85782101'


Trivial merge