Baystation12/Baystation12 — pull request #343 by Hawk-v3 (2012-02-01 20:05:52+00:00)
Title: Some small changes and a merge because people did fun things with code I was patching.

I may have bollocksed something.