From: Stephen Gran <steve@lobefin.net>
Date: Sat, 26 Dec 2009 20:25:06 +0000 (+0000)
Subject: Merge branch 'master' into staging
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=f03fa325338ec91f512601b63dca9470535f505c;p=dsa-puppet.git

Merge branch 'master' into staging
---

f03fa325338ec91f512601b63dca9470535f505c