Merge.

diff --cc src/lib/playlist.cc
index aea6c5f413deaae0f6c95e2a702a596f6e7010ae,0d6462f6c53d439ce3aec96895e29ed941f4bdb0..028b2b880bea67b3dfa64d3f32bba1157b3dc157
--- 1/src/lib/playlist.cc
--- 2/src/lib/playlist.cc
+++ b/src/lib/playlist.cc
@@@ -75,15 -75,15 +75,40 @@@ Playlist::content_changed (weak_ptr<Con
        if (p == ContentProperty::LENGTH) {
                maybe_sequence_video ();
        }
++<<<<<<< HEAD
 +      
 +      ContentChanged (c, p);
 +}
 +
++=======
+ 
+       ContentChanged (c, p);
+ }
+ 
++>>>>>>> 1ea6a456bc2b4a695f6db4720353c35167597b30
  void
  Playlist::maybe_sequence_video ()
  {
        if (!_sequence_video || _sequencing_video) {
                return;
++<<<<<<< HEAD
++      }
++      
++      _sequencing_video = true;
++      
++      ContentList cl = _content;
++      sort (cl.begin(), cl.end(), ContentSorter ());
++      Time last = 0;
++      for (ContentList::iterator i = cl.begin(); i != cl.end(); ++i) {
++              if (!dynamic_pointer_cast<VideoContent> (*i)) {
++                      continue;
++              }
++              
++              (*i)->set_start (last);
++              last = (*i)->end ();
++      }
++      
++=======
        }
        
        _sequencing_video = true;
@@@ -100,6 -100,6 +125,7 @@@
                last = (*i)->end ();
        }
        
++>>>>>>> 1ea6a456bc2b4a695f6db4720353c35167597b30
        _sequencing_video = false;
  }