merge of 'eb36ea3d0bc0c86631fe499a8eff4d72e96e9e86'
authorCliff Brake <cbrake@bec-systems.com>
Thu, 25 Oct 2007 02:58:27 +0000 (02:58 +0000)
committerCliff Brake <cbrake@bec-systems.com>
Thu, 25 Oct 2007 02:58:27 +0000 (02:58 +0000)
     and 'f404eeaff12f4a005212507219029f6899cf3bee'


Trivial merge