merge fixes from the main trunk

[SVN r17886]

include/boost/mpl/aux_/lambda_spec.hpp

@@ -18,6 +18,7 @@
 #define BOOST_MPL_AUX_LAMBDA_SPEC_HPP_INCLUDED
 
 #include "boost/mpl/lambda_fwd.hpp"
+#include "boost/mpl/int_fwd.hpp"
 #include "boost/mpl/aux_/preprocessor/params.hpp"
 #include "boost/mpl/aux_/lambda_arity_param.hpp"
 #include "boost/mpl/aux_/config/lambda.hpp"
@@ -30,7 +31,7 @@ template< \
     > \
 struct lambda< \
       name< BOOST_MPL_PP_PARAMS(i, T) > \
-    BOOST_MPL_AUX_LAMBDA_ARITY_PARAM(-1) \
+    BOOST_MPL_AUX_LAMBDA_ARITY_PARAM(int_<-1>) \
     > \
 { \
     typedef name< BOOST_MPL_PP_PARAMS(i, T) > type; \