d9747d8
Reorder some patches to prep things for pushing upstream better. Signed-off-by: Peter Jones <pjones@redhat.com>