puppetlabs/puppet — pull request #636 by cprice-puppet (2012-04-06 17:50:47+00:00)
Title: Refactor/master/12396 dry up timeout

This is just an update to pull request #450 to address the comments there from dpittman and nlew.