Merge branch 'master' of github.com:jquery/jquery
authorjeresig <jeresig@gmail.com>
Tue, 22 Dec 2009 18:53:04 +0000 (13:53 -0500)
committerjeresig <jeresig@gmail.com>
Tue, 22 Dec 2009 18:53:04 +0000 (13:53 -0500)

Trivial merge