Merge branch 'master' of ssh://git.planet-lab.org/git/sfa
authorMarco Yuen <marcoy@gmail.com>
Wed, 19 Jan 2011 21:15:07 +0000 (16:15 -0500)
committerMarco Yuen <marcoy@gmail.com>
Wed, 19 Jan 2011 21:15:07 +0000 (16:15 -0500)

Trivial merge