[SVN r71052] Conflicts: doc/html/boost_optional/detailed_semantics.html doc/html/index.html
[SVN r37809]