merge of 'cc263d55763d24968ff1650d6da1c299ffd7055b'
authorCliff Brake <cbrake@bec-systems.com>
Thu, 7 Feb 2008 16:12:57 +0000 (16:12 +0000)
committerCliff Brake <cbrake@bec-systems.com>
Thu, 7 Feb 2008 16:12:57 +0000 (16:12 +0000)
     and 'd6307337a4a614b8af793078e706592c7f85ba32'


Trivial merge