Merge commit 'origin/master'

author root <root@blitz.inria.fr>

Thu, 24 Mar 2011 14:48:12 +0000 (15:48 +0100)

committer root <root@blitz.inria.fr>

Thu, 24 Mar 2011 14:48:12 +0000 (15:48 +0100)
author root <root@blitz.inria.fr>
Thu, 24 Mar 2011 14:48:12 +0000 (15:48 +0100)
committer root <root@blitz.inria.fr>
Thu, 24 Mar 2011 14:48:12 +0000 (15:48 +0100)
diff --cc onelab-k27-tags.mk
Simple merge
diff --cc onelab-k32-tags.mk
Simple merge
diff --cc planetlab-k27-tags.mk
Simple merge
diff --cc planetlab-k32-tags.mk
Simple merge
author	root <root@blitz.inria.fr>
	Thu, 24 Mar 2011 14:48:12 +0000 (15:48 +0100)
committer	root <root@blitz.inria.fr>
	Thu, 24 Mar 2011 14:48:12 +0000 (15:48 +0100)
		1	2
onelab-k27-tags.mk	patch \|	diff1 \|	diff2 \|	blob \| history
onelab-k32-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