Merge branch 'master' of github.com:jquery/jquery
authorjeresig <jeresig@gmail.com>
Tue, 12 Jan 2010 04:32:33 +0000 (23:32 -0500)
committerjeresig <jeresig@gmail.com>
Tue, 12 Jan 2010 04:32:33 +0000 (23:32 -0500)

Trivial merge