Merge remote branch 'origin/master'
authorDan Bode <dan@puppetlabs.com>
Mon, 11 Oct 2010 15:35:19 +0000 (08:35 -0700)
committerDan Bode <dan@puppetlabs.com>
Mon, 11 Oct 2010 15:35:19 +0000 (08:35 -0700)

Trivial merge