Merge branch 'master' of github.com:jquery/jquery into jquery-master
authorColin Snover <github.com@zetafleet.com>
Mon, 10 Jan 2011 00:41:15 +0000 (18:41 -0600)
committerColin Snover <github.com@zetafleet.com>
Mon, 10 Jan 2011 00:41:15 +0000 (18:41 -0600)

Trivial merge