Merge remote-tracking branch 'origin/master'
authorGit User <support@planet-lab.org>
Tue, 5 Jun 2012 16:16:33 +0000 (12:16 -0400)
committerGit User <support@planet-lab.org>
Tue, 5 Jun 2012 16:16:33 +0000 (12:16 -0400)

Trivial merge