merge with master
authorPaul Davis <paul@linuxaudiosystems.com>
Thu, 12 Sep 2013 15:32:09 +0000 (11:32 -0400)
committerPaul Davis <paul@linuxaudiosystems.com>
Thu, 12 Sep 2013 15:32:09 +0000 (11:32 -0400)
1  2 
libs/ardour/audioengine.cc
libs/ardour/graph.cc

Simple merge
Simple merge