Merge remote-tracking branch 'local_master/geni-v3' into geni-v3
authorGit User <support@planet-lab.org>
Thu, 23 Aug 2012 19:06:39 +0000 (15:06 -0400)
committerGit User <support@planet-lab.org>
Thu, 23 Aug 2012 19:06:39 +0000 (15:06 -0400)

Trivial merge