Merge branch 'master' of http://github.com/stdpkg/stdpkg
Merge branch 'master' of http://github.com/stdpkg/stdpkg