Merge branch 'master' into test
authorEric Mc Sween <eric.mcsween@auf.org>
Mon, 21 Nov 2011 20:03:43 +0000 (15:03 -0500)
committerEric Mc Sween <eric.mcsween@auf.org>
Mon, 21 Nov 2011 20:03:43 +0000 (15:03 -0500)

Trivial merge