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

Trivial merge