Squashed commit of the following:

commit 248fc11b74921bbc742dad4366b20afb2d67b9c5
Author: Andy Goldstein <agoldste@redhat.com>
Date:   Tue Feb 5 13:37:42 2013 -0500

    squash2

commit 2e3f4bf921abe615710bf55f6cb99e60721e52a2
Author: Andy Goldstein <agoldste@redhat.com>
Date:   Tue Feb 5 13:37:36 2013 -0500

    squash1