Merge branch 'master' of dhozac@git.planet-lab.org:/git/bootmanager
authorDaniel Hokka Zakrisson <dhokka@cs.princeton.edu>
Tue, 14 Dec 2010 21:04:50 +0000 (16:04 -0500)
committerDaniel Hokka Zakrisson <dhokka@cs.princeton.edu>
Tue, 14 Dec 2010 21:04:50 +0000 (16:04 -0500)
commit23382d6d7f912ec3340761d57e7cdc1d1b4f2f1a
tree1149b857f81456e0c4faa93e3044520ada0e77ac
parentbf4d3de01db6a219169a61ce436c2096feb0a7ad
parent2ef3f820fcc2db08ee4e13e6b8b226c767b3c4ad
Merge branch 'master' of dhozac@git.planet-lab.org:/git/bootmanager