From bd9b744938e6396e1b74fa2314b6099de51a0119 Mon Sep 17 00:00:00 2001
From: Chris Feist <cfeist@redhat.com>
Date: Tue, 16 Oct 2012 17:57:25 -0500
Subject: [PATCH] Sync up to latest upstream sources