Merge branch 'master' of github.com:jquery/jquery into csshooks
authorjeresig <jeresig@gmail.com>
Wed, 8 Sep 2010 17:47:56 +0000 (13:47 -0400)
committerjeresig <jeresig@gmail.com>
Wed, 8 Sep 2010 17:47:56 +0000 (13:47 -0400)

Trivial merge