Merge branch 'master' into test
authorEric Mc Sween <eric.mcsween@auf.org>
Mon, 14 Jan 2013 16:04:43 +0000 (11:04 -0500)
committerEric Mc Sween <eric.mcsween@auf.org>
Mon, 14 Jan 2013 16:04:43 +0000 (11:04 -0500)

Trivial merge