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)

Trivial merge