I just committed the fix for #725 to X.Org HEAD. Apparently this doesn't constitute 'fixed-upstream', so I'm going to leave manipulation of the bug tags to someone who knwos this better than me.