Merge branch 'master' of ssh://git.planet-lab.org/git/sfa
authorMarco Yuen <marcoy@gmail.com>
Thu, 3 Feb 2011 14:55:18 +0000 (09:55 -0500)
committerMarco Yuen <marcoy@gmail.com>
Thu, 3 Feb 2011 14:55:18 +0000 (09:55 -0500)

Trivial merge