Merge remote-tracking branch 'refs/remotes/spaetz/565_workbench_cleanup'
authorChristopher Allan Webber <cwebber@dustycloud.org>
Thu, 17 Jan 2013 21:02:52 +0000 (15:02 -0600)
committerChristopher Allan Webber <cwebber@dustycloud.org>
Thu, 17 Jan 2013 21:02:52 +0000 (15:02 -0600)

Trivial merge