Merge branch 'master' of git@github.com:jquery/jquery
authorJohn Resig <jeresig@gmail.com>
Thu, 10 Dec 2009 04:59:12 +0000 (20:59 -0800)
committerJohn Resig <jeresig@gmail.com>
Thu, 10 Dec 2009 04:59:12 +0000 (20:59 -0800)

Trivial merge