From: Eric Mc Sween <eric.mcsween@auf.org>
Date: Mon, 21 Nov 2011 19:18:15 +0000 (-0500)
Subject: Merge branch 'master' into test
X-Git-Tag: DAE+RH~242^2
X-Git-Url: http://git.auf.org/?p=auf_rh_dae.git;a=commitdiff_plain;h=2aedae8118ac09578dddbce0983071df32263b6c

Merge branch 'master' into test
---

2aedae8118ac09578dddbce0983071df32263b6c