Merge branch 'bug7141' of http://github.com/csnover/jquery into csnover-bug7141
authorJohn Resig <jeresig@gmail.com>
Mon, 11 Oct 2010 20:40:10 +0000 (16:40 -0400)
committerJohn Resig <jeresig@gmail.com>
Mon, 11 Oct 2010 20:40:10 +0000 (16:40 -0400)

Trivial merge