Merge linux-latest (63) import into refs/heads/workingbranch
authorBen Hutchings <ben@decadent.org.uk>
Thu, 6 Nov 2014 20:46:28 +0000 (20:46 +0000)
committerBen Hutchings <ben@decadent.org.uk>
Thu, 6 Nov 2014 20:46:28 +0000 (20:46 +0000)

Trivial merge