Merge branch 'devel-2.0' into devel-2.1

* devel-2.0:
  Three small typos in man pages

Conflicts:
	man/gnt-cluster.sgml (trivial)

Signed-off-by: Iustin Pop <iustin@google.com>
Reviewed-by: Michael Hanselmann <hansmi@google.com>
Reviewed-by: Guido Trotter <ultrotter@google.com>