Merge branch 'master' of home:dvl/backup
authorCarl N Baldwin <cnb@hpsvcnb.fc.hp.com>
Tue, 1 Nov 2005 22:52:14 +0000 (15:52 -0700)
committerCarl N Baldwin <cnb@hpsvcnb.fc.hp.com>
Tue, 1 Nov 2005 22:52:14 +0000 (15:52 -0700)

Trivial merge