Correct confirm prompt processing.
Merge branch 'master' into oneiric