I've found a web-browsable VCS view of the mesa repository and noticed that the fix was committed upstream back in June: http://gitweb.freedesktop.org/?p=users/krh/mesa.git;a=commit;h=efbed00f7661aaf2bfad19e57e6b4d4c3623c9eb