Merge branch 'master' of http://homepage.ntlworld.com/cmarinas/stgit