Merge remote-tracking branch 'refs/remotes/spaetz/561_use_workbench_not_tempfiles'
authorChristopher Allan Webber <cwebber@dustycloud.org>
Wed, 16 Jan 2013 17:23:38 +0000 (11:23 -0600)
committerChristopher Allan Webber <cwebber@dustycloud.org>
Wed, 16 Jan 2013 17:23:38 +0000 (11:23 -0600)

Trivial merge