floodlight/loxigen — pull request #329 by rlane (2014-10-16 05:01:09+00:00)
Title: Merge master into of14 branch

Reviewer: trivial

Pulls in the recent LOCI cleanups.