Merge commit '9f4c899c0d90e1b51b6864834f3877b47c161a0e' into devel
authorTrond Myklebust <Trond.Myklebust@netapp.com>
Sat, 28 Mar 2009 20:50:58 +0000 (16:50 -0400)
committerTrond Myklebust <Trond.Myklebust@netapp.com>
Sat, 28 Mar 2009 20:50:58 +0000 (16:50 -0400)

Trivial merge