Merge branch 'dae' into test
authorEric Mc Sween <eric.mcsween@auf.org>
Mon, 14 Nov 2011 21:54:40 +0000 (16:54 -0500)
committerEric Mc Sween <eric.mcsween@auf.org>
Mon, 14 Nov 2011 21:54:40 +0000 (16:54 -0500)

Trivial merge