Merge branch 'master' of github.com:jquery/jquery
authorjeresig <jeresig@gmail.com>
Fri, 24 Sep 2010 22:02:39 +0000 (18:02 -0400)
committerjeresig <jeresig@gmail.com>
Fri, 24 Sep 2010 22:02:39 +0000 (18:02 -0400)

Trivial merge