Merge branch 'master' of ssh://oss.sgi.com/oss/git/xfs/xfs into for-linus
authorAlex Elder <aelder@sgi.com>
Tue, 13 Oct 2009 20:47:22 +0000 (15:47 -0500)
committerAlex Elder <aelder@sgi.com>
Tue, 13 Oct 2009 20:47:22 +0000 (15:47 -0500)

Trivial merge