Merge branch 't773' of github.com:ScottDowne/popcorn-js into t773b

Conflicts:
	test/popcorn.unit.js

test/popcorn.unit.js

@@ -867,13 +867,14 @@ test( "play(n)/pause(n) as shorthand to currentTime(n).play()/pause()", function
     }
   }
 
-  stop( 1000 );
+  stop( 10000 );
 
   function poll() {
 
     if ( $pop.media.readyState >= 2 ) {
       // this should trigger immediately
 
+<<<<<<< HEAD
       // IE9 has weird seek behaviour... this works around it
       $pop.listen( "seeked", function() {
         $pop.unlisten( "seeked" );
@@ -887,7 +888,26 @@ test( "play(n)/pause(n) as shorthand to currentTime(n).play()/pause()", function
       });
 
       $pop.play( 10 ).pause();
+=======
+      var firstSeekedEvent = function() {
 
+        $pop.unlisten( "seeked", firstSeekedEvent );
+        equal( Math.round( $pop.currentTime() ), 10, "play(n) sets currentTime to 10" );
+        plus();
+      
+        $pop.listen( "seeked", secondSeekedEvent );
+        $pop.pause( 5 );
+      },
+      secondSeekedEvent = function() {
+>>>>>>> 5547ccb102b5aed7b7ca8cf1266ee21c172fdfa5
+
+        $pop.unlisten( "seeked", secondSeekedEvent );
+        equal( Math.round( $pop.currentTime() ), 5, "pause(n) sets currentTime to 5" );
+        plus();
+      };
+      
+      $pop.listen( "seeked", firstSeekedEvent );
+      $pop.play( 10 ).pause();
     } else {
       setTimeout( poll, 10 );
     }