Merge commit 'v3.5-rc2' into next
authorJames Morris <james.l.morris@oracle.com>
Sun, 10 Jun 2012 12:52:10 +0000 (22:52 +1000)
committerJames Morris <james.l.morris@oracle.com>
Sun, 10 Jun 2012 12:52:10 +0000 (22:52 +1000)

Trivial merge