initial commit from berkeley server
Merge branch 'master' of https://github.com/ndhuang/shared-spt