Merge branch 'master' into test
authorEric Mc Sween <eric.mcsween@auf.org>
Mon, 30 Jan 2012 16:08:44 +0000 (11:08 -0500)
committerEric Mc Sween <eric.mcsween@auf.org>
Mon, 30 Jan 2012 16:08:44 +0000 (11:08 -0500)

Trivial merge