Change the commit log from 'cherry picked' to 'back ported', but otherwise looks good. Positive test results. rtg -- Tim Gardner tim.gardner at canonical.com