Merge branch 'bug7018' of http://github.com/csnover/jquery into csnover-bug7018