Merge branch 'master' of git://git.kernel.org/pub/scm/fs/xfs/xfs
authorFelix Blyakher <felixb@sgi.com>
Thu, 11 Jun 2009 21:56:49 +0000 (16:56 -0500)
committerFelix Blyakher <felixb@sgi.com>
Thu, 11 Jun 2009 21:56:49 +0000 (16:56 -0500)

Trivial merge