This was submitted by Hewlett Packard. I've reviewed it and tested it, but I would appreciate another pair of eyes before I commit it. https://bugzilla.redhat.com/show_bug.cgi?id=590062 https://bugzilla.redhat.com/attachment.cgi?id=450337&action=diff https://bugzilla.redhat.com/attachment.cgi?id=450337&action=edit