Merge branch 'master' of git@github.com:jquery/jquery
authorJohn Resig <jeresig@gmail.com>
Fri, 11 Dec 2009 20:47:55 +0000 (12:47 -0800)
committerJohn Resig <jeresig@gmail.com>
Fri, 11 Dec 2009 20:47:55 +0000 (12:47 -0800)

Trivial merge