Merge from V5_1_5_BR branch 26/11/2010

diff --git a/doc/docutils/conf.py b/doc/docutils/conf.py
index a193dd95e45908d8c26c9a1d96899b2ab4039426..2a98b01fb3c5137209c5681547e7a427b3b91247 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 = '5.1.5'
 # The full version, including alpha/beta/rc tags.
-release = '5.1.4'
+release = '5.1.5'
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.