Merge branch 'test' into dev
authorEric Mc Sween <eric.mcsween@auf.org>
Tue, 5 Jun 2012 15:16:09 +0000 (11:16 -0400)
committerEric Mc Sween <eric.mcsween@auf.org>
Tue, 5 Jun 2012 15:16:09 +0000 (11:16 -0400)

Trivial merge