Merge branch 'master' of ssh://git.planet-lab.org/git/build
authorS.Çağlar Onur <caglar@cs.princeton.edu>
Wed, 22 Dec 2010 01:28:03 +0000 (20:28 -0500)
committerS.Çağlar Onur <caglar@cs.princeton.edu>
Wed, 22 Dec 2010 01:28:03 +0000 (20:28 -0500)

Trivial merge