Merge branch 'bug7150' of http://github.com/csnover/jquery