Merge branch 'dev' into test
authorEric Mc Sween <eric.mcsween@gmail.com>
Thu, 24 Mar 2011 16:38:11 +0000 (12:38 -0400)
committerEric Mc Sween <eric.mcsween@gmail.com>
Thu, 24 Mar 2011 16:38:11 +0000 (12:38 -0400)

Trivial merge