I am going ahead and marking this as a duplicate of bug 640096 since it has the patch and a request for merging already even though this was the original bug report.
I am going ahead and marking this as a duplicate of bug 640096 since it has the patch and a request for merging already even though this was the original bug report.