Merge branch 'master' of github.com:jquery/jquery
authorjeresig <jeresig@gmail.com>
Wed, 26 Jan 2011 21:36:51 +0000 (16:36 -0500)
committerjeresig <jeresig@gmail.com>
Wed, 26 Jan 2011 21:36:51 +0000 (16:36 -0500)

Trivial merge