Merge commit 'origin/master'
authorroot <root@blitz.inria.fr>
Wed, 23 Mar 2011 14:48:13 +0000 (15:48 +0100)
committerroot <root@blitz.inria.fr>
Wed, 23 Mar 2011 14:48:13 +0000 (15:48 +0100)
commitc797cfab12863c73de5619c38dcfee91fe1016c4
treef3fa6b8dc6d315efa02744d98d52e863bce3f072
parent0a0f9ed4537d2749d7264a9768087f5b7fd67c4b
parentf52b8b654a859d2b9a48bcd723ffb8afe8c18ef2
Merge commit 'origin/master'
onelab-k27-tags.mk
onelab-k32-tags.mk
planetlab-k27-tags.mk
planetlab-k32-tags.mk