Reintegrate head@r272414
authorgjb <gjb@FreeBSD.org>
Thu, 2 Oct 2014 16:32:52 +0000 (16:32 +0000)
committergjb <gjb@FreeBSD.org>
Thu, 2 Oct 2014 16:32:52 +0000 (16:32 +0000)
commit17d149e272ca76d27e3b160a26f291549ad2c2d8
tree3e499ba79d1fbb7cdab57e0ca353145fcbbf4b4a
parent040f030a2495f88fd7791a5e37d7472471af8461
parenta3936f706df833896eb9ce53af23efe835a1cdd1
Reintegrate head@r272414

Sponsored by: The FreeBSD Foundation