Merge branch 'master' into lxc_devel
authorMarco Yuen <marcoy@cs.princeton.edu>
Thu, 22 Dec 2011 15:46:14 +0000 (10:46 -0500)
committerMarco Yuen <marcoy@cs.princeton.edu>
Thu, 22 Dec 2011 15:46:14 +0000 (10:46 -0500)
commit27eb8a7156718285a99598b40d84c016e1f13dee
tree43a09e198296a751be91d610fa861d00eb971fce
parent28ddc9b66fe43e83c2e4afcf8d9eb5d4718e8f01
parent4caed67aeddb38f0b310963d582a8b2d6832053b
Merge branch 'master' into lxc_devel

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