Merge remote-tracking branch 'gfs2/master'
authorStephen Rothwell <sfr@canb.auug.org.au>
Mon, 30 May 2011 01:45:50 +0000 (11:45 +1000)
committerStephen Rothwell <sfr@canb.auug.org.au>
Mon, 30 May 2011 01:45:50 +0000 (11:45 +1000)

Trivial merge