Merge commit 'origin/master'
authorroot <root@blitz.inria.fr>
Wed, 30 Mar 2011 17:45:18 +0000 (19:45 +0200)
committerroot <root@blitz.inria.fr>
Wed, 30 Mar 2011 17:45:18 +0000 (19:45 +0200)
commit1bc9e626e0167823351f3255a57f5be79367dc06
tree24a9950fa103b3451430e0ff619f491d85094e2a
parentd5bfdad2aaa260a7d46a3efb912bd2febeb491f7
parent88fe51bec04a5202be62816a143e2462babeed2d
Merge commit 'origin/master'
onelab-k32-tags.mk
planetlab-k32-tags.mk