Merge branch 'master' of ssh://git.planet-lab.org/git/lxc-userspace
Sapan Bhatia [Fri, 28 Jun 2013 16:53:35 +0000 (12:53 -0400)]

Trivial merge