Merge branch 'master' of ssh://git.planet-lab.org/git/build
authorS.Çağlar Onur <caglar@cs.princeton.edu>
Tue, 4 Jan 2011 19:51:26 +0000 (14:51 -0500)
committerS.Çağlar Onur <caglar@cs.princeton.edu>
Tue, 4 Jan 2011 19:51:26 +0000 (14:51 -0500)

Trivial merge