merge of '7c2dfd8725acfc6de0286a17d58cccbfa6c141f8'
authorCliff Brake <cbrake@bec-systems.com>
Fri, 12 Oct 2007 12:54:06 +0000 (12:54 +0000)
committerCliff Brake <cbrake@bec-systems.com>
Fri, 12 Oct 2007 12:54:06 +0000 (12:54 +0000)
     and 'a06a3079e29738b3d834a584143671d46904548d'


Trivial merge