based off commit id db2c7179427e113d6decc3be5dc8a2f3cac3da17 Signed-off-by: Michael Meeks <michael.meeks@novell.com>