r3377: Merge in first part of modified patch from Nalin Dahyabhai <nalin@redhat.com>