Merge branch '614_multi_test_config'
authorChristopher Allan Webber <cwebber@dustycloud.org>
Fri, 5 Apr 2013 00:44:36 +0000 (19:44 -0500)
committerChristopher Allan Webber <cwebber@dustycloud.org>
Fri, 5 Apr 2013 00:44:36 +0000 (19:44 -0500)

Trivial merge