Merge branch 'test'
authorEric Mc Sween <eric.mcsween@auf.org>
Tue, 13 Dec 2011 20:25:32 +0000 (15:25 -0500)
committerEric Mc Sween <eric.mcsween@auf.org>
Tue, 13 Dec 2011 20:25:32 +0000 (15:25 -0500)

Trivial merge