[Merge] lp:~arky/ubuntu/maverick/casper/fixes-621561 into lp:ubuntu/casper

[Colin Watson]

Review: Approve
Thanks!  This looks sensible.  I've adjusted trivial whitespace details and added a debian/changelog entry, but otherwise will merge this directly.
-- 
https://code.launchpad.net/~arky/ubuntu/maverick/casper/fixes-621561/+merge/42098
Your team Ubuntu Development Team is requested to review the proposed merge of lp:~arky/ubuntu/maverick/casper/fixes-621561 into lp:ubuntu/casper.