Merge remote-tracking branch 'refs/remotes/pythonsnake/581_config'
authorChristopher Allan Webber <cwebber@dustycloud.org>
Sun, 24 Feb 2013 19:52:13 +0000 (13:52 -0600)
committerChristopher Allan Webber <cwebber@dustycloud.org>
Sun, 24 Feb 2013 19:52:13 +0000 (13:52 -0600)

Trivial merge