Merge branch '4.3' of dhozac@git.planet-lab.org:/git/bootmanager into 4.3
authorDaniel Hokka Zakrisson <dhokka@cs.princeton.edu>
Tue, 14 Dec 2010 20:55:16 +0000 (15:55 -0500)
committerDaniel Hokka Zakrisson <dhokka@cs.princeton.edu>
Tue, 14 Dec 2010 20:55:16 +0000 (15:55 -0500)
commit4d7ebcb2f75108f95484a4000cca2489c4ef32b1
treef220fc25a557bdda00b19d8e1f3e95f768c02f70
parentc2e73a0cf0a4cf3898014924cff6bb3563691fac
parentaba9d455d5735fba3a0854aeda221bc9614d385c
Merge branch '4.3' of dhozac@git.planet-lab.org:/git/bootmanager into 4.3