Merge commit 'origin/master'

author root <root@blitz.inria.fr>

Wed, 30 Mar 2011 17:45:18 +0000 (19:45 +0200)

committer root <root@blitz.inria.fr>

Wed, 30 Mar 2011 17:45:18 +0000 (19:45 +0200)
author root <root@blitz.inria.fr>
Wed, 30 Mar 2011 17:45:18 +0000 (19:45 +0200)
committer root <root@blitz.inria.fr>
Wed, 30 Mar 2011 17:45:18 +0000 (19:45 +0200)
diff --cc onelab-k32-tags.mk
Simple merge
diff --cc planetlab-k32-tags.mk
Simple merge
author	root <root@blitz.inria.fr>
	Wed, 30 Mar 2011 17:45:18 +0000 (19:45 +0200)
committer	root <root@blitz.inria.fr>
	Wed, 30 Mar 2011 17:45:18 +0000 (19:45 +0200)
		1	2
onelab-k32-tags.mk	patch \|	diff1 \|	diff2 \|	blob \| history
planetlab-k32-tags.mk	patch \|	diff1 \|	diff2 \|	blob \| history