Merge branch 'sfc-3.11'
authorBen Hutchings <bhutchings@solarflare.com>
Wed, 21 Aug 2013 13:19:36 +0000 (14:19 +0100)
committerBen Hutchings <bhutchings@solarflare.com>
Wed, 21 Aug 2013 13:19:36 +0000 (14:19 +0100)
Merge sfc fixes destined for 3.11 so we can avoid conflicts with
development for 3.12+.


Trivial merge