Merge branch 'origin'
authorTrond Myklebust <Trond.Myklebust@netapp.com>
Tue, 15 May 2007 20:11:17 +0000 (16:11 -0400)
committerTrond Myklebust <Trond.Myklebust@netapp.com>
Tue, 15 May 2007 20:11:17 +0000 (16:11 -0400)

Trivial merge