Merge branch 'devel' into for-linus
authorTrond Myklebust <Trond.Myklebust@netapp.com>
Wed, 1 Apr 2009 17:28:15 +0000 (13:28 -0400)
committerTrond Myklebust <Trond.Myklebust@netapp.com>
Wed, 1 Apr 2009 17:28:15 +0000 (13:28 -0400)

Trivial merge