Merge commit 'origin/master'

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

Wed, 1 Dec 2010 16:50:20 +0000 (11:50 -0500)

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

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