From: Stephen Gran <steve@lobefin.net>
Date: Mon, 18 Jan 2010 14:10:06 +0000 (+0000)
Subject: Merge branch 'master' into staging
X-Git-Url: https://git.donarmstrong.com/?p=dsa-puppet.git;a=commitdiff_plain;h=5700593c5c0a7d7b98a435b22738ce46b4b67013

Merge branch 'master' into staging
---

5700593c5c0a7d7b98a435b22738ce46b4b67013