Merge branch 'master' of ssh+git://oss.sgi.com/oss/git/xfs/xfs
authorFelix Blyakher <felixb@sgi.com>
Mon, 31 Aug 2009 20:22:44 +0000 (15:22 -0500)
committerFelix Blyakher <felixb@sgi.com>
Mon, 31 Aug 2009 20:22:44 +0000 (15:22 -0500)

Trivial merge