Merge branch 'geni-v2' of ssh://git.planet-lab.org/git/sfa into geni-v2
authorTony Mack <tmack@paris.CS.Princeton.EDU>
Wed, 13 Nov 2013 14:51:30 +0000 (09:51 -0500)
committerTony Mack <tmack@paris.CS.Princeton.EDU>
Wed, 13 Nov 2013 14:51:30 +0000 (09:51 -0500)

Trivial merge