Comment 25 for bug 742967

I've queued up lucid and maverick versions of these two patches for after we get bug 687501 validated. With any luck I can use that time to figure out how to make things work when Wubi is on a different partition from Windows, and include that too.