Merge branch 'dev' into test
authorEric Mc Sween <eric.mcsween@gmail.com>
Wed, 9 Feb 2011 19:00:44 +0000 (14:00 -0500)
committerEric Mc Sween <eric.mcsween@gmail.com>
Wed, 9 Feb 2011 19:00:44 +0000 (14:00 -0500)

Trivial merge