Merge from V5_1_main 26/11/2010

diff --git a/doc/docutils/conf.py b/doc/docutils/conf.py
index 5afa71b2f9aaa6b7d8d013a0fe38773bc8ae5b5c..c7e2c6e769c8eca83d8b6a1a9ccfc8e7a91ce0fa 100644 (file)
--- a/doc/docutils/conf.py
+++ b/doc/docutils/conf.py
@@ -54,9 +54,9 @@ copyright = '2010 EDF R&D'
 # built documents.
 #
 # The short X.Y version.
-version = '5.1.4'
+version = '6.2.0'
 # The full version, including alpha/beta/rc tags.
-release = '5.1.4'
+release = '6.2.0'
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.