Merge branch 'markj-kernel-config' into 20130324-ndp-locking
Wire the destination buffers before acquiring the NDP lock.
Fix a couple of lock leaks and add an assert.
Merge branch 'master' into 20130324-ndp-locking
Merge branch '20130324-ndp-locking' into markj-develop