Merge branch 'devel-2.0' into devel-2.1
authorIustin Pop <iustin@google.com>
Mon, 1 Feb 2010 10:40:01 +0000 (11:40 +0100)
committerIustin Pop <iustin@google.com>
Mon, 1 Feb 2010 10:44:25 +0000 (11:44 +0100)
commit9b3b68452cac21d51b9c59d74c0f525eca9d99f8
tree6bdb9504357a76aeca6ef91a877dd8478265a5b6
parent433c63aab0342a567f993374c86d73391e67d85d
parentba0b05fee97b91a358636eb8b56b6736e1cba0ee
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>
man/gnt-cluster.sgml
man/gnt-instance.sgml