Merge branch 'master' of github.com:jquery/jquery into jquery-master
authorColin Snover <github.com@zetafleet.com>
Mon, 17 Jan 2011 21:32:57 +0000 (15:32 -0600)
committerColin Snover <github.com@zetafleet.com>
Mon, 17 Jan 2011 21:32:57 +0000 (15:32 -0600)

Trivial merge