merge changes from head
authorMark Huang <mlhuang@cs.princeton.edu>
Wed, 7 Feb 2007 19:06:06 +0000 (19:06 +0000)
committerMark Huang <mlhuang@cs.princeton.edu>
Wed, 7 Feb 2007 19:06:06 +0000 (19:06 +0000)
commitfd3b83dd785a1e16c2e45795091fc1ac275cdfe5
tree821bfb91f34383716924ce043be12d0e8f049bc7
parentae2d57eebb6600ab23f7dba3b370e7290f5298b7
merge changes from head
plc.d/bootcd
plc.d/bootmanager