Merge branch 'master' into lxc
authorMarco Yuen <marcoy@gmail.com>
Wed, 14 Dec 2011 17:13:36 +0000 (12:13 -0500)
committerMarco Yuen <marcoy@gmail.com>
Wed, 14 Dec 2011 17:13:36 +0000 (12:13 -0500)
commit76f404f997d5686dd505459f02e48454165103ff
tree07b3516ac27f3609b2ce5a213b577ca22f75cf5c
parent2a9f9048aae7beabd3d6f594bb6ba243dc0b9de0
parent80a46cb13a72495289b6c2cea0eaafd369a8ca61
Merge branch 'master' into lxc

Conflicts:
onelab-k32-tags.mk
planetlab-k32-tags.mk
onelab-k32-tags.mk
planetlab-k32-tags.mk