merge changes from HEAD
authorMark Huang <mlhuang@cs.princeton.edu>
Tue, 6 Feb 2007 21:35:46 +0000 (21:35 +0000)
committerMark Huang <mlhuang@cs.princeton.edu>
Tue, 6 Feb 2007 21:35:46 +0000 (21:35 +0000)
commitbcf6238269ac5998a2183b4df68035d538a408db
tree49a6a8e264cd1860c5c93d37c99e9104c8d61fe4
parenta9f6d17ac136e064dc27ff70ee57e849cd06cbb6
merge changes from HEAD
planetlab.mk