Merge branch 'master' into workbench
authorChristopher Allan Webber <cwebber@dustycloud.org>
Sun, 12 Jun 2011 00:49:44 +0000 (19:49 -0500)
committerChristopher Allan Webber <cwebber@dustycloud.org>
Sun, 12 Jun 2011 00:49:44 +0000 (19:49 -0500)

Trivial merge