Merge branch 'master' of github.com:jquery/jquery
authorjeresig <jeresig@gmail.com>
Sat, 23 Jan 2010 17:52:39 +0000 (12:52 -0500)
committerjeresig <jeresig@gmail.com>
Sat, 23 Jan 2010 17:52:39 +0000 (12:52 -0500)

Trivial merge