Merge branch 'master' of dhozac@git.planet-lab.org:/git/build
authorDaniel Hokka Zakrisson <dhokka@cs.princeton.edu>
Wed, 10 Nov 2010 16:15:08 +0000 (11:15 -0500)
committerDaniel Hokka Zakrisson <dhokka@cs.princeton.edu>
Wed, 10 Nov 2010 16:15:08 +0000 (11:15 -0500)

Trivial merge