Merge branch 'issue-449' of github.com:ppp0/puppet-packages into issue-455
Merge branch 'master' of github.com:cargomedia/puppet-packages into issue-455
Merge branch 'master' of github.com:cargomedia/puppet-packages into issue-455
Adapt polipo's memory requirements
Merge pull request #455 from ppp0/issue-455

Make virtualbox module work with wheezy