Merge remote-tracking branch 'origin/master'
authorGit User <support@planet-lab.org>
Sun, 4 Mar 2012 15:26:12 +0000 (10:26 -0500)
committerGit User <support@planet-lab.org>
Sun, 4 Mar 2012 15:26:12 +0000 (10:26 -0500)

Trivial merge