Merge branch 'dev' into test
authorEric Mc Sween <eric.mcsween@auf.org>
Wed, 16 May 2012 19:55:36 +0000 (15:55 -0400)
committerEric Mc Sween <eric.mcsween@auf.org>
Wed, 16 May 2012 19:55:36 +0000 (15:55 -0400)

Trivial merge