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

Trivial merge