Merge branch 'lxc' into lxc_devel
authorMarco Yuen <marcoy@cs.princeton.edu>
Thu, 23 Feb 2012 17:20:12 +0000 (12:20 -0500)
committerMarco Yuen <marcoy@cs.princeton.edu>
Thu, 23 Feb 2012 17:20:12 +0000 (12:20 -0500)

Trivial merge