merge to release branch

[SVN r66420]

src/basic_serializer_map.cpp

@@ -16,6 +16,10 @@
 #include <utility>
 
 #define BOOST_ARCHIVE_SOURCE
+// include this to prevent linker errors when the
+// same modules are marked export and import.
+#define BOOST_SERIALIZATION_SOURCE
+
 #include <boost/archive/archive_exception.hpp>
 #include <boost/serialization/throw_exception.hpp>