merge gnomecanvas into ardour tree, so that we can fix our own bugs and not wait...