Merge branch 'master' into lxc_devel lxcbuild
authorMarco Yuen <marcoy@cs.princeton.edu>
Tue, 6 Dec 2011 17:22:02 +0000 (12:22 -0500)
committerMarco Yuen <marcoy@cs.princeton.edu>
Tue, 6 Dec 2011 17:22:02 +0000 (12:22 -0500)
commitda256268978e70f27e39f26012abd615e26a99c4
tree87753160032f2f01ac3b5ef1014b13f60ab9a8ef
parentb2758c0c0334f73375e5937d2538b80d73959fdb
parent067abb138667e15c83204ce4a46814fb5e7b1993
Merge branch 'master' into lxc_devel