Merge branch 'master' of dhozac@git.planet-lab.org:/git/build
authorDaniel Hokka Zakrisson <dhokka@cs.princeton.edu>
Mon, 29 Nov 2010 14:32:29 +0000 (09:32 -0500)
committerDaniel Hokka Zakrisson <dhokka@cs.princeton.edu>
Mon, 29 Nov 2010 14:32:29 +0000 (09:32 -0500)

Trivial merge