tree e348ab4c4cfcfc32384bb0363cec1a6f6e04abf6
parent 3c23d66fc30e8805a2b66708acd3f0da921085ba
parent 0b375ab0a511568fe2c80aede9a297b640212d35
author Junio C Hamano <junkio@cox.net> 1170283277 -0800
committer Junio C Hamano <junkio@cox.net> 1170283410 -0800

Merge branch 'master' of git://linux-nfs.org/~bfields/git

This is in the hope of giving JBF's user-manual wider exposure.
I am not very happy with trailing whitespaces in the new
document, but let's not worry too much about the formatting
issues for now, but concentrate more on the structure and the
contents.