Remerge HEAD changes and fix errant 1.34.0 -> 1.35.0 change.

[SVN r34421]

Jamfile.v2

@@ -122,8 +122,8 @@ alias prg_exec_monitor : libs/test/build//boost_prg_exec_monitor ;
 alias test_exec_monitor : libs/test/build//boost_test_exec_monitor ;
 alias unit_test_framework : libs/test/build//boost_unit_test_framework ;
 alias bgl-vis : libs/graps/build//bgl-vis ;
-alias serialization : libs/serialization//serialization ;
-alias wserialization : libs/serialization//wserialization ;
+alias serialization : libs/serialization/build//boost_serialization ;
+alias wserialization : libs/serialization/build//boost_wserialization ;
 
 explicit prg_exec_monitor test_exec_monitor unit_test_framework
     bgl-vis serialization wserialization ;