Merge remote-tracking branch 'origin/master'
authorGit User <support@planet-lab.org>
Wed, 6 Jun 2012 14:36:34 +0000 (10:36 -0400)
committerGit User <support@planet-lab.org>
Wed, 6 Jun 2012 14:36:34 +0000 (10:36 -0400)

Trivial merge