Merge branch 'master' into test
authorEric Mc Sween <eric.mcsween@gmail.com>
Wed, 15 Dec 2010 15:35:21 +0000 (10:35 -0500)
committerEric Mc Sween <eric.mcsween@gmail.com>
Wed, 15 Dec 2010 15:35:21 +0000 (10:35 -0500)

Trivial merge