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