[Merge] lp:~brightbox/ubuntu/natty/cloud-initramfs-tools/fix-765843 into lp:ubuntu/natty/cloud-initramfs-tools

[Clint Byrum]

Marking as work in progress, since this is not ready for merge into lp:ubuntu/natty/cloud-initramfs-tools. That will require an SRU-friendly changelog update, and will require the fix that was merged into Scott's tree to land in Oneiric.
-- 
https://code.launchpad.net/~brightbox/ubuntu/natty/cloud-initramfs-tools/fix-765843/+merge/58675
Your team Ubuntu Development Team is requested to review the proposed merge of lp:~brightbox/ubuntu/natty/cloud-initramfs-tools/fix-765843 into lp:ubuntu/natty/cloud-initramfs-tools.