From: Asbjørn Sloth Tønnesen <ast@mugami.com>
Date: Wed, 30 Mar 2011 14:50:28 +0000 (+0000)
Subject: Merge branch 'master' of git://github.com/jquery/jquery into fixedbuild
X-Git-Url: http://git.asbjorn.biz/?a=commitdiff_plain;h=refs%2Fheads%2Ffixedbuild;hp=36647696b69c208c3c965d0f04603e55e184b784;p=jquery.git

Merge branch 'master' of git://github.com/jquery/jquery into fixedbuild
---

diff --git a/.gitmodules b/.gitmodules
index 80ce236..19c6041 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,6 +1,6 @@
 [submodule "src/sizzle"]
 	path = src/sizzle
-	url = git://github.com/jeresig/sizzle.git
+	url = git://github.com/jquery/sizzle.git
 [submodule "test/qunit"]
 	path = test/qunit
 	url = git://github.com/jquery/qunit.git
diff --git a/src/support.js b/src/support.js
index 939ad4f..095866b 100644
--- a/src/support.js
+++ b/src/support.js
@@ -197,7 +197,7 @@
 		if ( document.defaultView && document.defaultView.getComputedStyle ) {
 			div.style.width = "1px";
 			div.style.marginRight = "0";
-			jQuery.support.reliableMarginRight = ( parseInt(document.defaultView.getComputedStyle(div).marginRight, 10) || 0 ) === 0;
+			jQuery.support.reliableMarginRight = ( parseInt(document.defaultView.getComputedStyle(div, null).marginRight, 10) || 0 ) === 0;
 		}
 
 		body.removeChild( div ).style.display = "none";