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

Trivial merge