Merge branch 'master' of ssh://git.planet-lab.org/git/plcapi
authorS.Çağlar Onur <caglar@cs.princeton.edu>
Mon, 6 Dec 2010 20:30:51 +0000 (15:30 -0500)
committerS.Çağlar Onur <caglar@cs.princeton.edu>
Mon, 6 Dec 2010 20:30:51 +0000 (15:30 -0500)

Trivial merge