Merge branch 'bug7123' of http://github.com/csnover/jquery into csnover-bug7123
authorJohn Resig <jeresig@gmail.com>
Sat, 9 Oct 2010 20:27:59 +0000 (16:27 -0400)
committerJohn Resig <jeresig@gmail.com>
Sat, 9 Oct 2010 20:27:59 +0000 (16:27 -0400)

Trivial merge