Comment 6 for bug 531866

Since this patch is awaiting upstream review (well, its an upstream patch), I'm marking it as patch-forwarded-upstream. Once upstream accepts, we will work to getting this into ubuntu