merge with master, with minor conflict fixes

diff --cc gtk2_ardour/mixer_strip.cc
Simple merge

diff --cc gtk2_ardour/panner_ui.cc
Simple merge

diff --cc gtk2_ardour/stereo_panner.cc
Simple merge

diff --cc libs/ardour/ardour/file_source.h
Simple merge

diff --cc libs/ardour/file_source.cc
Simple merge

diff --cc libs/ardour/session_state.cc
index 5c3ffae3cc087c58031b3384bb5e01e2511ec89d,ffbe55afbf7184d250e8dd1b7c26a53d74aa9e1b..3e117f61d394274ed63c005ed5b8a2e56640503b
--- 1/libs/ardour/session_state.cc
--- 2/libs/ardour/session_state.cc
+++ b/libs/ardour/session_state.cc
@@@ -136,8 -135,23 +136,8 @@@ Session::pre_engine_init (string fullpa
  
        /* discover canonical fullpath */
  
 -      char buf[PATH_MAX+1];
 +      _path = canonical_path(fullpath);
-       
+ 
 -      if (!realpath (fullpath.c_str(), buf)) {
 -              if (errno == ENOENT) {
 -                      /* fullpath does not exist yet, so realpath() returned
 -                       * ENOENT. Just use it as-is
 -                       */
 -                      _path = fullpath;
 -              } else {
 -                      error << string_compose(_("Could not use path %1 (%2)"), buf, strerror(errno)) << endmsg;
 -                      destroy ();
 -                      throw failed_constructor();
 -              }
 -      } else {
 -              _path = string(buf);
 -      }
 -      
        /* we require _path to end with a dir separator */
  
        if (_path[_path.length()-1] != G_DIR_SEPARATOR) {

diff --cc wscript
Simple merge