Merge branch 'bug_6158' of https://github.com/jboesch/jquery into jboesch-bug_6158
authorJohn Resig <jeresig@gmail.com>
Tue, 15 Mar 2011 21:06:24 +0000 (17:06 -0400)
committerJohn Resig <jeresig@gmail.com>
Tue, 15 Mar 2011 21:06:24 +0000 (17:06 -0400)

Trivial merge