Merge branch 'master' of ssh://git.planet-lab.org/git/lxc-userspace
Sapan Bhatia [Wed, 26 Mar 2014 14:14:03 +0000 (10:14 -0400)]

Trivial merge