Merge branch 'master' of https://github.com/scottjehl/jquery into scottjehl-master
authorJohn Resig <jeresig@gmail.com>
Thu, 20 Jan 2011 19:39:57 +0000 (14:39 -0500)
committerJohn Resig <jeresig@gmail.com>
Thu, 20 Jan 2011 19:39:57 +0000 (14:39 -0500)

Trivial merge