Merge branch 'master' of git+ssh://git.melbourne.sgi.com/git/xfs