Merge commit 'oberon-drobilla-lad/master'

Merge commit 'oberon-drobilla-lad/master'

Conflicts:
	trunk/eugene/wscript
	trunk/flowcanvas/flowcanvas/Module.hpp
	trunk/flowcanvas/src/Canvas.cpp
	trunk/flowcanvas/src/Item.cpp
	trunk/flowcanvas/src/Module.cpp
	trunk/flowcanvas/src/Port.cpp
	trunk/flowcanvas/wscript
	trunk/ingen/src/bindings/Client.hpp
	trunk/ingen/src/client/ClientStore.cpp
	trunk/ingen/src/client/ClientStore.hpp
	trunk/ingen/src/client/DeprecatedLoader.cpp
	trunk/ingen/src/client/HTTPClientReceiver.cpp
	trunk/ingen/src/client/HTTPClientReceiver.hpp
	trunk/ingen/src/client/HTTPEngineSender.cpp
	trunk/ingen/src/client/HTTPEngineSender.hpp
	trunk/ingen/src/client/OSCClientReceiver.cpp
	trunk/ingen/src/client/OSCClientReceiver.hpp
	trunk/ingen/src/client/OSCEngineSender.cpp
	trunk/ingen/src/client/OSCEngineSender.hpp
	trunk/ingen/src/client/ObjectModel.cpp
	trunk/ingen/src/client/ObjectModel.hpp
	trunk/ingen/src/client/PatchModel.cpp
	trunk/ingen/src/client/PatchModel.hpp
	trunk/ingen/src/client/PluginModel.cpp
	trunk/ingen/src/client/PluginModel.hpp
	trunk/ingen/src/client/SigClientInterface.hpp
	trunk/ingen/src/client/ThreadedSigClientInterface.cpp
	trunk/ingen/src/client/ThreadedSigClientInterface.hpp
	trunk/ingen/src/common/interface/ClientInterface.hpp
	trunk/ingen/src/common/interface/CommonInterface.hpp
	trunk/ingen/src/common/interface/GraphObject.hpp
	trunk/ingen/src/common/interface/Plugin.hpp
	trunk/ingen/src/engine/ClientBroadcaster.cpp
	trunk/ingen/src/engine/ClientBroadcaster.hpp
	trunk/ingen/src/engine/ConnectionImpl.cpp
	trunk/ingen/src/engine/DuplexPort.cpp
	trunk/ingen/src/engine/Engine.cpp
	trunk/ingen/src/engine/Engine.hpp
	trunk/ingen/src/engine/GraphObjectImpl.hpp
	trunk/ingen/src/engine/HTTPEngineReceiver.cpp
	trunk/ingen/src/engine/HTTPEngineReceiver.hpp
	trunk/ingen/src/engine/InternalPlugin.cpp
	trunk/ingen/src/engine/JackAudioDriver.cpp
	trunk/ingen/src/engine/JackMidiDriver.cpp
	trunk/ingen/src/engine/JackMidiDriver.hpp
	trunk/ingen/src/engine/LADSPANode.cpp
	trunk/ingen/src/engine/LV2Plugin.cpp
	trunk/ingen/src/engine/NodeFactory.cpp
	trunk/ingen/src/engine/OSCClientSender.cpp
	trunk/ingen/src/engine/OSCClientSender.hpp
	trunk/ingen/src/engine/OSCEngineReceiver.cpp
	trunk/ingen/src/engine/ObjectSender.cpp
	trunk/ingen/src/engine/ObjectSender.hpp
	trunk/ingen/src/engine/PluginImpl.hpp
	trunk/ingen/src/engine/PortImpl.hpp
	trunk/ingen/src/engine/QueuedEngineInterface.cpp
	trunk/ingen/src/engine/QueuedEngineInterface.hpp
	trunk/ingen/src/engine/events/CreateNodeEvent.cpp
	trunk/ingen/src/engine/events/CreatePatchEvent.cpp
	trunk/ingen/src/engine/events/CreatePortEvent.cpp
	trunk/ingen/src/engine/events/RequestAllObjectsEvent.cpp
	trunk/ingen/src/engine/events/RequestObjectEvent.cpp
	trunk/ingen/src/engine/events/SendPortActivityEvent.cpp
	trunk/ingen/src/engine/wscript
	trunk/ingen/src/gui/App.cpp
	trunk/ingen/src/gui/ConnectWindow.cpp
	trunk/ingen/src/gui/LoadPluginWindow.cpp
	trunk/ingen/src/gui/NewSubpatchWindow.cpp
	trunk/ingen/src/gui/NodeModule.cpp
	trunk/ingen/src/gui/NodeModule.hpp
	trunk/ingen/src/gui/NodePropertiesWindow.cpp
	trunk/ingen/src/gui/PatchCanvas.cpp
	trunk/ingen/src/gui/PatchPortModule.cpp
	trunk/ingen/src/gui/PatchPortModule.hpp
	trunk/ingen/src/gui/PatchPropertiesWindow.cpp
	trunk/ingen/src/gui/PatchView.cpp
	trunk/ingen/src/gui/PatchWindow.cpp
	trunk/ingen/src/gui/Port.cpp
	trunk/ingen/src/gui/Port.hpp
	trunk/ingen/src/gui/ThreadedLoader.cpp
	trunk/ingen/src/gui/UploadPatchWindow.cpp
	trunk/ingen/src/gui/ingen_gui.glade
	trunk/ingen/src/ingen/cmdline.c
	trunk/ingen/src/ingen/cmdline.ggo
	trunk/ingen/src/ingen/cmdline.h
	trunk/ingen/src/ingen/main.cpp
	trunk/ingen/src/module/Module.cpp
	trunk/ingen/src/serialisation/Parser.cpp
	trunk/ingen/src/serialisation/Parser.hpp
	trunk/ingen/src/serialisation/Serialiser.cpp
	trunk/ingen/src/serialisation/Serialiser.hpp
	trunk/ingen/src/shared/Builder.cpp
	trunk/ingen/src/shared/ClashAvoider.cpp
	trunk/ingen/src/shared/ClashAvoider.hpp
	trunk/ingen/src/shared/wscript
	trunk/lv2/ext/data_access/lv2_data_access.h
	trunk/lv2/ext/polymorphic_port/lv2_polymorphic_port.ttl
	trunk/lv2core/ChangeLog
	trunk/lv2core/debian-sid/copyright
	trunk/lv2core/debian-sid/rules
	trunk/lv2core/lv2core.lv2/lv2.ttl
	trunk/lv2core/wscript
	trunk/machina/src/engine/Engine.cpp
	trunk/machina/src/engine/Evolver.cpp
	trunk/machina/src/engine/JackDriver.cpp
	trunk/machina/src/engine/LearnRequest.cpp
	trunk/machina/src/engine/Machine.cpp
	trunk/machina/src/engine/MachineBuilder.cpp
	trunk/machina/src/engine/Mutation.cpp
	trunk/machina/src/engine/Node.cpp
	trunk/machina/src/engine/Problem.cpp
	trunk/machina/src/engine/Recorder.cpp
	trunk/machina/src/engine/SMFDriver.cpp
	trunk/machina/src/engine/machina/Driver.hpp
	trunk/machina/src/engine/machina/Engine.hpp
	trunk/machina/src/engine/machina/Evolver.hpp
	trunk/machina/src/engine/machina/JackDriver.hpp
	trunk/machina/src/engine/machina/LearnRequest.hpp
	trunk/machina/src/engine/machina/MachineBuilder.hpp
	trunk/machina/src/engine/machina/Mutation.hpp
	trunk/machina/src/engine/machina/Problem.hpp
	trunk/machina/src/engine/machina/Recorder.hpp
	trunk/machina/src/engine/machina/SMFDriver.hpp
	trunk/machina/src/gui/EdgeView.cpp
	trunk/machina/src/gui/GladeXml.hpp
	trunk/machina/src/gui/MachinaCanvas.cpp
	trunk/machina/src/gui/MachinaGUI.cpp
	trunk/machina/src/gui/MachinaGUI.hpp
	trunk/machina/src/gui/NodePropertiesWindow.cpp
	trunk/machina/src/gui/main.cpp
	trunk/mda-lv2/Makefile
	trunk/raul/raul/Atom.hpp
	trunk/raul/raul/AtomicInt.hpp
	trunk/raul/raul/AtomicPtr.hpp
	trunk/raul/raul/Quantizer.hpp
	trunk/raul/raul/RingBuffer.hpp
	trunk/raul/raul/Semaphore.hpp
	trunk/raul/raul/Thread.hpp
	trunk/raul/raul/TimeSlice.hpp
	trunk/raul/raul/TimeStamp.hpp
	trunk/raul/src/Path.cpp
	trunk/raul/tests/time_test.cpp
	trunk/redlandmm/src/Model.cpp
	trunk/slv2/ChangeLog
	trunk/slv2/slv2.ttl
	trunk/slv2/slv2/plugin.h
	trunk/slv2/slv2/pluginui.h
	trunk/slv2/slv2/port.h
	trunk/slv2/src/plugin.c
	trunk/slv2/src/port.c
	trunk/slv2/src/slv2_internal.h
	trunk/slv2/src/util.c
	trunk/slv2/wscript
	trunk/wscript