Merge branch 'dev'
authorEric Mc Sween <eric.mcsween@auf.org>
Thu, 21 Jun 2012 18:24:41 +0000 (14:24 -0400)
committerEric Mc Sween <eric.mcsween@auf.org>
Thu, 21 Jun 2012 18:24:41 +0000 (14:24 -0400)

Trivial merge