Commit 51fbcfed6d9c120cb7d2d37a4ad77353aceff5f4

Con Kolivas 2013-04-15T11:25:48

Avoid more recursive locks.