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

Trivial merge