Comment 50 for bug 413135

The following patch fixes the aforementioned remaining issues for me. If we can get another successful test on this, I'd like to upload it for Karmic. The code path this touches only affects machines that meet the requirements for PAE, so I think it's pretty safe.