From: johann <johann@sun.com>
Date: Fri, 18 Dec 2009 22:16:18 +0000 (+0100)
Subject: Merge branch 'b1_8' of git.lustre.org:prime/lustre into b1_8
X-Git-Tag: v1_8_1_58~1
X-Git-Url: https://git.whamcloud.com/?a=commitdiff_plain;h=0bc18b73bdc60321cf38749647df4fe76088877e;p=fs%2Flustre-release.git

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

0bc18b73bdc60321cf38749647df4fe76088877e