merged fusion from the trunk

[SVN r63560]

test/sequence/adapt_tpl_struct.cpp

@@ -97,14 +97,14 @@ main()
     {
         // conversion from point to vector
         point p = {5, 3};
-        vector<int, short> v(p);
+        vector<int, long> v(p);
         v = p;
     }
 
     {
         // conversion from point to list
         point p = {5, 3};
-        list<int, short> l(p);
+        list<int, long> l(p);
         l = p;
     }