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