Merge branch 'eventprops.1.6final' of https://github.com/rwldrn/jquery into rwldrn...

Conflicts:
	test/unit/event.js

diff --cc src/event.js
index 788bb20ebb0cf3a9834bb96e41e41b277bdfa706,fe19718906281e239f4189fe9aeff98d9b9fb241..a4f02a7a0a900a16a25963e01ec7cf914be422e9
--- 1/src/event.js
--- 2/src/event.js
+++ b/src/event.js
@@@ -850,12 -875,12 +859,12 @@@ function trigger( type, elem, args ) 
  }
  
  // Create "bubbling" focus and blur events
 -if ( document.addEventListener ) {
 +if ( !jQuery.support.focusinBubbles ) {
        jQuery.each({ focus: "focusin", blur: "focusout" }, function( orig, fix ) {
-       
+ 
                // Attach a single capturing handler while someone wants focusin/focusout
                var attaches = 0;
-               
+ 
                jQuery.event.special[ fix ] = {
                        setup: function() {
                                if ( attaches++ === 0 ) {

diff --cc test/unit/event.js
Simple merge