Merge remote-tracking branch 'origin/geni-v2' into geni-v2
authorGit User <support@planet-lab.org>
Thu, 14 Nov 2013 12:46:46 +0000 (07:46 -0500)
committerGit User <support@planet-lab.org>
Thu, 14 Nov 2013 12:46:46 +0000 (07:46 -0500)

Trivial merge