Merge remote-tracking branch 'refs/remotes/elrond/misc/pytest_enable_testing'
authorChristopher Allan Webber <cwebber@dustycloud.org>
Fri, 17 May 2013 16:13:17 +0000 (11:13 -0500)
committerChristopher Allan Webber <cwebber@dustycloud.org>
Fri, 17 May 2013 16:13:17 +0000 (11:13 -0500)

Trivial merge