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