From: Johann Lombardi <johann@sun.com>
Date: Thu, 17 Jun 2010 08:49:57 +0000 (+0200)
Subject: Merge branch 'b1_8' of git@git.lustre.org:prime/lustre into b1_8
X-Git-Tag: v1_8_3_54~5
X-Git-Url: https://git.whamcloud.com/gitweb?a=commitdiff_plain;h=474a3fe4bdb63021b8352f756c301bd1be5e1a99;p=fs%2Flustre-release.git

Merge branch 'b1_8' of git@git.lustre.org:prime/lustre into b1_8
---

474a3fe4bdb63021b8352f756c301bd1be5e1a99