Merge branch 'proposed' of git://github.com/gustavh/stgit