Merge commit '9408938' from 565_workbench_cleanup (spaetz)
authorChristopher Allan Webber <cwebber@dustycloud.org>
Thu, 17 Jan 2013 17:12:13 +0000 (11:12 -0600)
committerChristopher Allan Webber <cwebber@dustycloud.org>
Thu, 17 Jan 2013 17:12:13 +0000 (11:12 -0600)

Trivial merge