Corrected bug with confirm prompt changes.
Merge branch 'master' into oneiric