Merge branch 'dev' into test
authorEric Mc Sween <eric.mcsween@gmail.com>
Tue, 15 Mar 2011 21:06:41 +0000 (17:06 -0400)
committerEric Mc Sween <eric.mcsween@gmail.com>
Tue, 15 Mar 2011 21:06:41 +0000 (17:06 -0400)

Trivial merge