fixed previous commit
Merge branch 'ipop' of github.com:mihaisoloi/conpaas into ipop