Merge git://oss.sgi.com:8090/oss/git/rc-fixes-xfs-2.6