Merge branch 'master' of github.com:jquery/jquery
authorjeresig <jeresig@gmail.com>
Wed, 3 Nov 2010 23:00:05 +0000 (19:00 -0400)
committerjeresig <jeresig@gmail.com>
Wed, 3 Nov 2010 23:00:05 +0000 (19:00 -0400)

Trivial merge