From: John Resig <jeresig@gmail.com>
Date: Sat, 9 Oct 2010 20:21:02 +0000 (-0400)
Subject: Merge branch 'animate-nonblock' of http://github.com/csnover/jquery into csnover... 
X-Git-Url: http://git.asbjorn.biz/?p=jquery.git;a=commitdiff_plain;h=b0dcc1746f58f5aca17a12794dd928c0deaaa6a0

Merge branch 'animate-nonblock' of github.com/csnover/jquery into csnover-animate-nonblock
---

b0dcc1746f58f5aca17a12794dd928c0deaaa6a0
diff --cc test/unit/css.js
index 3131af3,02a7b08..8a49096
--- a/test/unit/css.js
+++ b/test/unit/css.js
@@@ -1,9 -1,9 +1,9 @@@
  module("css");
  
  test("css(String|Hash)", function() {
 -	expect(29);
 +	expect(33);
  
- 	equals( jQuery('#main').css("display"), 'none', 'Check for css property "display"');
+ 	equals( jQuery('#main').css("display"), 'block', 'Check for css property "display"');
  
  	ok( jQuery('#nothiddendiv').is(':visible'), 'Modifying CSS display: Assert element is visible');
  	jQuery('#nothiddendiv').css({display: 'none'});