From: jeresig <jeresig@gmail.com>
Date: Thu, 14 Apr 2011 19:57:47 +0000 (-0400)
Subject: Merge branch '8099' of https://github.com/rwldrn/jquery. Fixes #8099.
X-Git-Tag: 1.6b1~2
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=1dda994c463f01977c7126407998d61efed218a5;p=jquery.git

Merge branch '8099' of https://github.com/rwldrn/jquery. Fixes #8099.

Conflicts:
	test/data/testsuite.css
---

1dda994c463f01977c7126407998d61efed218a5
diff --cc test/data/testsuite.css
index a9dd97ba4,683803e8b..99851eaa5
--- a/test/data/testsuite.css
+++ b/test/data/testsuite.css
@@@ -110,5 -110,7 +110,10 @@@ div#show-tests * { display: none; 
  #nothiddendivchild.em { font-size: 2em; }
  #nothiddendivchild.prct { font-size: 150%; }
  
 +/* For testing type on vml in IE #7071 */
- v\:oval { behavior:url(#default#VML); display:inline-block; }
++v\:oval { behavior:url(#default#VML); display:inline-block; }
++
+ /* 8099 changes to default styles are read correctly */
+ tt { display: none; }
+ sup { display: none; }
+ dfn { display: none; }