Merge branch 'master' of git+ssh://oss.sgi.com/oss/git/xfs/xfs
authorFelix Blyakher <felixb@sgi.com>
Thu, 22 Jan 2009 04:39:29 +0000 (22:39 -0600)
committerFelix Blyakher <felixb@sgi.com>
Thu, 22 Jan 2009 04:39:29 +0000 (22:39 -0600)

Trivial merge