Comment 16 for bug 1016349

I just resynced with the upstream sources which include a fix for this problem.