merge of '70743353147a08503a9017cee4e94dd6388552d4'
authorCliff Brake <cbrake@bec-systems.com>
Mon, 1 Oct 2007 19:36:43 +0000 (19:36 +0000)
committerCliff Brake <cbrake@bec-systems.com>
Mon, 1 Oct 2007 19:36:43 +0000 (19:36 +0000)
     and 'a2075ec1a9e24c066821c558d351b7716ebee907'


Trivial merge