2009-12-14 Geoff Norton <gnorton@novell.com>