Merge branch 'master' of github.com:jquery/jquery into 1.7/callbacks

Conflicts:
	test/index.html

test/delegatetest.html

@@ -182,11 +182,21 @@
 	        <td id='submitSubmit' class="red">BUTTON</td>
 	        <td id='boundSubmit' class="red">DOCUMENT</td>
 	</tr>
-        </table>
+	</table>
+
+	<h1>Mouseleave Tests</h1>
+
+	<div class="out" style="margin:20px; border:1px solid #000; background: red;">
+		<p>Count mouse leave event</p>
+		<div class="in" style="background: green; margin: 10px auto; width: 50%;">
+			<p>mouse over here should not trigger the counter.</p>
+		</div>
+		<p>0</p>
+	</div>
 
 	<ul id="log"></ul>
 
-        <script type='text/javascript'>
+	<script type='text/javascript'>
 	jQuery.fn.addChangeClickTest = function( id, prevent ) {
 		this.bind("focusin", function(){
 			jQuery(id + "focus").blink();
@@ -270,6 +280,10 @@
 		jQuery("#boundSubmit").blink();
 	});
 
-        </script>
+	var n = 0;
+	$("div.out").live("mouseleave", function() {
+		$("p:last", this).text(++n);
+	});
+	</script>
     </body>
 </html>