Baystation12/Baystation12 — pull request #974 by caelaislinn (2012-05-04 14:01:50+00:00)
Title: releasing maplock for erthilo to merge antiqua changes. 

intending to relock it later, see commit list for changes

Signed-off-by: CaelAislinn