Semihalf/contrail-controller — pull request #19 by semihalf-ermel-dominik (2014-07-30 13:31:01+00:00)
Title: Dev merge 2

Merge from newest master + fixes needed on FreeBSD.