Merge branch 'locks'
authorTrond Myklebust <Trond.Myklebust@netapp.com>
Wed, 5 Jul 2006 17:19:25 +0000 (13:19 -0400)
committerTrond Myklebust <Trond.Myklebust@netapp.com>
Wed, 5 Jul 2006 17:19:25 +0000 (13:19 -0400)

Trivial merge