Merge branch 'devel'
authorTrond Myklebust <Trond.Myklebust@netapp.com>
Thu, 24 Apr 2008 18:01:02 +0000 (14:01 -0400)
committerTrond Myklebust <Trond.Myklebust@netapp.com>
Thu, 24 Apr 2008 18:01:02 +0000 (14:01 -0400)

Trivial merge