Merge branch 'devel' into next
authorTrond Myklebust <Trond.Myklebust@netapp.com>
Tue, 30 Dec 2008 21:51:43 +0000 (16:51 -0500)
committerTrond Myklebust <Trond.Myklebust@netapp.com>
Tue, 30 Dec 2008 21:51:43 +0000 (16:51 -0500)

Trivial merge