Merge "LVM release 1.05 delivery" into gingerbread