sync up with what's on the branch
sync up with what's on the branch

planetlab/NodeManager,dreibh/planetlab-lxc-nodemanager,dreibh/planetlab-lxc-nodemanager,planetlab/NodeManager,dreibh/planetlab-lxc-nodemanager,planetlab/NodeManager,planetlab/NodeManager