Merge branch 'master' of github.com:jquery/jquery
authorjeresig <jeresig@gmail.com>
Mon, 8 Feb 2010 16:31:13 +0000 (11:31 -0500)
committerjeresig <jeresig@gmail.com>
Mon, 8 Feb 2010 16:31:13 +0000 (11:31 -0500)

Trivial merge