Merge branch 'master' of ssh://sapanb@git.planet-lab.org/git/afterthought
Sapan Bhatia [Fri, 12 Nov 2010 16:06:22 +0000 (11:06 -0500)]

Trivial merge