Merge branch 'master' of git://github.com/puppetlabs/puppetlabs-stdlib
authorMartin Hellmich <mhellmic@gmail.com>
Mon, 22 Apr 2013 21:24:38 +0000 (23:24 +0200)
committerMartin Hellmich <mhellmic@gmail.com>
Mon, 22 Apr 2013 21:24:38 +0000 (23:24 +0200)

Trivial merge