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

Trivial merge