Merge branch 'master' of dhozac@git.planet-lab.org:/git/build
authorDaniel Hokka Zakrisson <dhokka@cs.princeton.edu>
Mon, 19 Jul 2010 20:12:12 +0000 (16:12 -0400)
committerDaniel Hokka Zakrisson <dhokka@cs.princeton.edu>
Mon, 19 Jul 2010 20:12:12 +0000 (16:12 -0400)

Trivial merge