fix a screwup I made in bec200eb80eb3bf690138cc1601561fdd17936c4

this fixes the ambiguity warnings in PR #6078
Merge branch 'master' of github.com:JuliaLang/julia