Merge branch 'master' of github.com:jquery/jquery into jquery-master
authorColin Snover <github.com@zetafleet.com>
Mon, 7 Feb 2011 16:52:33 +0000 (10:52 -0600)
committerColin Snover <github.com@zetafleet.com>
Mon, 7 Feb 2011 16:52:33 +0000 (10:52 -0600)

Trivial merge