merge of '780336c3de0d7fe07bb3dea94d53434644cd189c'
authorCliff Brake <cbrake@bec-systems.com>
Thu, 13 Dec 2007 13:46:58 +0000 (13:46 +0000)
committerCliff Brake <cbrake@bec-systems.com>
Thu, 13 Dec 2007 13:46:58 +0000 (13:46 +0000)
     and 'd72c64644be54ac05950d6f4b33d72196e8b3a9f'


Trivial merge