Implement new 'ROUTED' interface type
Merge remote-tracking branch 'origin/ubuntu' into public
Project Calico version 2014.1-0ubuntu1.2-calico0.1
Remove packaging changes from master branch

The plan from now on, for the calico-nova and calico-neutron
repositories, is that the master branch will only contain
Calico-related OpenStack code changes.  There will be separate
branches for Ubuntu and Red Hat packaging, and we will merge the
master branch into those before preparing new package releases.
Merge branch 'master' into ubuntu
Project Calico version 2014.1-0ubuntu1.2-calico0.1