Merge container from trunk

[SVN r78593]

test/set_test.hpp

@@ -40,7 +40,7 @@ int set_test ()
    MyBoostMultiSet *boostmultiset = new MyBoostMultiSet;
    MyStdMultiSet *stdmultiset = new MyStdMultiSet;
 
-   //Test construction from a range   
+   //Test construction from a range  
    {
       IntType aux_vect[50];
       for(int i = 0; i < 50; ++i){
@@ -483,7 +483,7 @@ int set_test_copyable ()
 
          boostmsetcopy = *boostmultiset;
          stdmsetcopy = *stdmultiset;
-         
+        
          if(!CheckEqualContainers(&boostmsetcopy, &stdmsetcopy))
             return 1;
       }