initial commit from cvs
Merge branch 'master' of github.com:ncultra/Pegasus-2.5

merge commit