tree 2faa0f44de45722ec8e7617adb11b027dbf5b788
parent 32316bb7ace91f13c49ced8cc4c4bf489b481452
parent a79665dc54dc05b1ffb9575049cd78b41eb59e64
author Jonathan Hart <jono@onlab.us> 1365095920 -0700
committer Jonathan Hart <jono@onlab.us> 1365097501 -0700

Merge branch 'master' of https://github.com/OPENNETWORKINGLAB/ONOS

At some point my fix for #296 got clobbered in a merge.
This commit adds it back in.