Merge branch 'for-linus' of git+ssh://git.melbourne.sgi.com/git/xfs
authorLachlan McIlroy <lachlan@redback.melbourne.sgi.com>
Fri, 9 Jan 2009 05:24:48 +0000 (16:24 +1100)
committerLachlan McIlroy <lachlan@redback.melbourne.sgi.com>
Fri, 9 Jan 2009 05:24:48 +0000 (16:24 +1100)

Trivial merge