Merge branch 'master' into dev
authorEric Mc Sween <eric.mcsween@auf.org>
Wed, 6 Jun 2012 18:26:24 +0000 (14:26 -0400)
committerEric Mc Sween <eric.mcsween@auf.org>
Wed, 6 Jun 2012 18:26:24 +0000 (14:26 -0400)

Trivial merge