Backported from X.org, patch found in janitor cleanup commit...

 commit 8ba0ca32a63c532f128bdca7f1bf982cab8e12be
 Author: Paulo Cesar Pereira de Andrade <pcpa@mandriva.com.br>
 Date:   Wed Jan 28 20:31:42 2009 -0200