[Pkg-lustre-svn-commit] updated: [683b69c] Merge commit 'upstream/1.8.4.git20100804'

[Patrick Winnertz]

The following commit has been merged in the master branch:
commit 683b69cbd7e24f608a628d9e9e523f726ac3ee4b
Merge: f4955cc9f15f553d276cf6445457c6911af3b89a bff2c31139d54d31a8aff511427ab11ee7b4c4c1
Author: Patrick Winnertz <winnie at debian.org>
Date:   Wed Aug 4 11:11:32 2010 +0200

    Merge commit 'upstream/1.8.4.git20100804'
    
    Conflicts:
    	ldiskfs/build
    
    Signed-off-by: Patrick Winnertz <winnie at debian.org>


-- 
Lustre Debian Packaging