Merge commit 'origin/master'
authorroot <root@blitz.inria.fr>
Thu, 24 Mar 2011 14:48:12 +0000 (15:48 +0100)
committerroot <root@blitz.inria.fr>
Thu, 24 Mar 2011 14:48:12 +0000 (15:48 +0100)
commit6a06f4f5f0bf6f743bd2b79d43855f5d456240f9
tree5e4ddaf3357edea47c67a771cdf914801590b3c4
parent29b982455fbe5a56b6f6fe02492b4d5d9e338273
parent6e569437a258f2cac69d262a29ad564879bfd956
Merge commit 'origin/master'
onelab-k27-tags.mk
onelab-k32-tags.mk
planetlab-k27-tags.mk
planetlab-k32-tags.mk