Merge branch 'master' into next
* master:
GIT 1.5.1-rc2
git-svn: fix rel_path() when not connected to the repository root
use xmalloc in git.c and help.c
Update README to point at a few key periodical messages to the list
user-manual: introduce "branch" and "branch head" differently
glossary: clean up cross-references
glossary: stop generating automatically
user-manual: Use def_ instead of ref_ for glossary references.
user-manual.txt: fix a tiny typo.
user-manual: run xsltproc without --nonet option