Merge commit 'origin/master'

author root <root@cassidy.cs.princeton.edu>

Thu, 2 Dec 2010 13:20:29 +0000 (08:20 -0500)

committer root <root@cassidy.cs.princeton.edu>

Thu, 2 Dec 2010 13:20:29 +0000 (08:20 -0500)
author root <root@cassidy.cs.princeton.edu>
Thu, 2 Dec 2010 13:20:29 +0000 (08:20 -0500)
committer root <root@cassidy.cs.princeton.edu>
Thu, 2 Dec 2010 13:20:29 +0000 (08:20 -0500)
diff --cc onelab-k27-tags.mk
Simple merge
diff --cc planetlab-k27-tags.mk
Simple merge
author	root <root@cassidy.cs.princeton.edu>
	Thu, 2 Dec 2010 13:20:29 +0000 (08:20 -0500)
committer	root <root@cassidy.cs.princeton.edu>
	Thu, 2 Dec 2010 13:20:29 +0000 (08:20 -0500)
		1	2
onelab-k27-tags.mk	patch \|	diff1 \|	diff2 \|	blob \| history
planetlab-k27-tags.mk	patch \|	diff1 \|	diff2 \|	blob \| history