Merge branch 'dev' into test
authorEric Mc Sween <eric.mcsween@auf.org>
Mon, 14 May 2012 17:37:15 +0000 (13:37 -0400)
committerEric Mc Sween <eric.mcsween@auf.org>
Mon, 14 May 2012 17:37:15 +0000 (13:37 -0400)

Trivial merge