Merge branch 'master' of git@github.com:jquery/jquery
authorJohn Resig <jeresig@gmail.com>
Thu, 14 Jan 2010 06:42:37 +0000 (01:42 -0500)
committerJohn Resig <jeresig@gmail.com>
Thu, 14 Jan 2010 06:42:37 +0000 (01:42 -0500)

Trivial merge