lxc/lxc — pull request #360 by ashtoreth (2014-11-21 19:25:00+00:00)
Title: Merge pull request #2 from lxc/master

merging upstream