Merge branch 'master' of ssh://git.planet-lab.org/git/lxctools
Sapan Bhatia [Fri, 24 May 2013 14:51:32 +0000 (10:51 -0400)]

Trivial merge