Commit 9840c12e7419f0972e83e8289869d2a43d22fe3e

Con Kolivas 2012-01-20T14:47:17

Generalise locking init code.