merge of '1a130f677a5150a067c580db5a25b619d936b441'
authorCliff Brake <cbrake@bec-systems.com>
Mon, 8 Oct 2007 21:21:17 +0000 (21:21 +0000)
committerCliff Brake <cbrake@bec-systems.com>
Mon, 8 Oct 2007 21:21:17 +0000 (21:21 +0000)
     and 'b6719256c07784e7f380e4fade8dd9c293214e44'


Trivial merge