really screwy merge trancking behavior, starting over

[SVN r44394]

integer_traits.html

@@ -77,7 +77,7 @@ Test Program</h2>
 
 <p>
 
-The program <code><a href="test/integer_traits_test.cpp">integer_traits_test.cpp</a></code>
+The program <code><a href="integer_traits_test.cpp">integer_traits_test.cpp</a></code>
 exercises the <code>integer_traits</code> class.
 
 <h2>Acknowledgements</h2>

test/Jamfile.v2

@@ -1,12 +0,0 @@
-#~ Copyright Rene Rivera 2008
-#~ Distributed under the Boost Software License, Version 1.0.
-#~ (See accompanying file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
-
-import testing ;
-
-test-suite integer
-    :   [ run cstdint_test.cpp ]
-        [ run integer_test.cpp ]
-        [ run integer_traits_test.cpp
-            /boost/test//boost_test_exec_monitor/<link>static ]
-    ;