Colin - I assumed these were all cherry picks and reapplied them by hand with proper attribution and SHA1s. Please verify that I've got them correct. rtg -- Tim Gardner tim.gardner at canonical.com