Merge branch 'map-object.1.6' of https://github.com/danheberden/jquery into danheberd...

author jeresig <jeresig@gmail.com>

Sun, 10 Apr 2011 20:46:14 +0000 (16:46 -0400)

committer jeresig <jeresig@gmail.com>

Sun, 10 Apr 2011 20:46:14 +0000 (16:46 -0400)
author jeresig <jeresig@gmail.com>
Sun, 10 Apr 2011 20:46:14 +0000 (16:46 -0400)
committer jeresig <jeresig@gmail.com>
Sun, 10 Apr 2011 20:46:14 +0000 (16:46 -0400)
diff --cc src/core.js
Simple merge
diff --cc test/unit/core.js
Simple merge
author	jeresig <jeresig@gmail.com>
	Sun, 10 Apr 2011 20:46:14 +0000 (16:46 -0400)
committer	jeresig <jeresig@gmail.com>
	Sun, 10 Apr 2011 20:46:14 +0000 (16:46 -0400)
		1	2
src/core.js	patch \|	diff1 \|	diff2 \|	blob \| history
test/unit/core.js	patch \|	diff1 \|	diff2 \|	blob \| history