Merge branch 'master' into test
authorEric Mc Sween <eric.mcsween@auf.org>
Mon, 14 May 2012 20:46:09 +0000 (16:46 -0400)
committerEric Mc Sween <eric.mcsween@auf.org>
Mon, 14 May 2012 20:46:09 +0000 (16:46 -0400)

Trivial merge