Merge branch 'master' into dev
authorEric Mc Sween <eric.mcsween@auf.org>
Tue, 25 Sep 2012 14:49:03 +0000 (10:49 -0400)
committerEric Mc Sween <eric.mcsween@auf.org>
Tue, 25 Sep 2012 14:49:03 +0000 (10:49 -0400)

Trivial merge