Merge branch 'dev' into test
authorEric Mc Sween <eric.mcsween@gmail.com>
Fri, 25 Mar 2011 14:41:36 +0000 (10:41 -0400)
committerEric Mc Sween <eric.mcsween@gmail.com>
Fri, 25 Mar 2011 14:41:36 +0000 (10:41 -0400)

Trivial merge