Merge commit 'local_master/master'

author root <root@blitz.inria.fr>

Fri, 18 Feb 2011 20:03:12 +0000 (21:03 +0100)

committer root <root@blitz.inria.fr>

Fri, 18 Feb 2011 20:03:12 +0000 (21:03 +0100)
author root <root@blitz.inria.fr>
Fri, 18 Feb 2011 20:03:12 +0000 (21:03 +0100)
committer root <root@blitz.inria.fr>
Fri, 18 Feb 2011 20:03:12 +0000 (21:03 +0100)
diff --cc onelab-k22-tags.mk
Simple merge
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@blitz.inria.fr>
	Fri, 18 Feb 2011 20:03:12 +0000 (21:03 +0100)
committer	root <root@blitz.inria.fr>
	Fri, 18 Feb 2011 20:03:12 +0000 (21:03 +0100)
		1	2
onelab-k22-tags.mk	patch \|	diff1 \|	diff2 \|	blob \| history
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