merge of '119a1b8e3787f193a0a34391450debc2878897c4'
authorCliff Brake <cbrake@bec-systems.com>
Mon, 13 Nov 2006 19:10:05 +0000 (19:10 +0000)
committerCliff Brake <cbrake@bec-systems.com>
Mon, 13 Nov 2006 19:10:05 +0000 (19:10 +0000)
     and '4f36e4b6e145cb3251f372bb7153308459b7ea41'


Trivial merge