A slightly different patch for this issue was submitted in duplicate bug #754870. Please take a look if you feel that it will be useful.
A slightly different patch for this issue was submitted in duplicate bug #754870. Please take a look if you feel that it will be useful.