Merge remote-tracking branch 'origin/geni-v3' into geni-v3
authorGit User <support@planet-lab.org>
Tue, 12 Nov 2013 22:32:20 +0000 (17:32 -0500)
committerGit User <support@planet-lab.org>
Tue, 12 Nov 2013 22:32:20 +0000 (17:32 -0500)

Trivial merge