Merge branch 'master' of github.com:afternoon/puppet-apt
authorBen Godfrey <ben.godfrey@wonga.com>
Fri, 11 Mar 2011 16:42:32 +0000 (16:42 +0000)
committerBen Godfrey <Ben Godfrey ben@ben2.com>
Fri, 11 Mar 2011 16:42:45 +0000 (16:42 +0000)

Trivial merge