Merge branch 'master' of ssh://github.com/openvswitch/ovs into master_new
authorGurucharan Shetty <guru@ovn.org>
Thu, 14 Jan 2016 17:03:06 +0000 (09:03 -0800)
committerGurucharan Shetty <guru@ovn.org>
Thu, 14 Jan 2016 17:03:06 +0000 (09:03 -0800)

Trivial merge