Merge branch 'master' of github.com:jquery/jquery
authorjeresig <jeresig@gmail.com>
Wed, 6 Jan 2010 16:32:39 +0000 (11:32 -0500)
committerjeresig <jeresig@gmail.com>
Wed, 6 Jan 2010 16:32:39 +0000 (11:32 -0500)

Trivial merge