cc6246a
Initial pseudo merge for dist-git setup This will significantly simplify future merges between branches.