Merge branch 'k.o/for-4.5-rc' into HEAD
authorDoug Ledford <dledford@redhat.com>
Thu, 3 Mar 2016 15:18:41 +0000 (10:18 -0500)
committerDoug Ledford <dledford@redhat.com>
Thu, 3 Mar 2016 15:18:41 +0000 (10:18 -0500)

Trivial merge