Pushed to master

My first commit: http://cgit.freedesktop.org/mesa/mesa/commit/?id=777a7f2003f260cc383f14029413f48101ae5718