From 2d8da8f64acdaa3791c5836ad1d4611b20ce9844 Mon Sep 17 00:00:00 2001
From: Brandon Kohn <blkohn@hotmail.com>
Date: Thu, 6 Oct 2011 17:27:17 +0000
Subject: [PATCH] Merge of numeric_cast_traits in numeric conversion library.

[SVN r74762]
---
 libs/maintainers.txt    | 2 +-
 libs/numeric/conversion | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/libs/maintainers.txt b/libs/maintainers.txt
index e100f9f58c..7e9865a942 100644
--- a/libs/maintainers.txt
+++ b/libs/maintainers.txt
@@ -58,7 +58,7 @@ mpl                   Aleksey Gurtovoy <agurtovoy -at- meta-comm.com>
 msm                   Christophe Henry <christophe.j.henry -at-  googlemail.com>
 multi_array           Ronald Garcia <garcia -at- osl.iu.edu>
 multi_index           Joaquin M Lopez Munoz <joaquin -at- tid.es>
-numeric/conversion    Fernando Cacciola <fernando_cacciola -at- ciudad.com.ar>
+numeric/conversion    Fernando Cacciola <fernando_cacciola -at- ciudad.com.ar>, Brandon Kohn <blkohn -at- hotmail.com>
 numeric/interval      Sylvain Pion <Sylvain.Pion -at- sophia.inria.fr>, Herve Bronnimann <hbr -at- poly.edu>, Guillaume Melquiond <guillaume.melquiond -at- ens-lyon.fr>
 numeric/ublas         Michael Stevens <michael -at- michael-stevens.de>
 optional              Fernando Cacciola <fernando_cacciola -at- ciudad.com.ar>
diff --git a/libs/numeric/conversion b/libs/numeric/conversion
index 7e74dc080e..238b6ab769 160000
--- a/libs/numeric/conversion
+++ b/libs/numeric/conversion
@@ -1 +1 @@
-Subproject commit 7e74dc080edab515da2f8a7678bdbf73f2a1a953
+Subproject commit 238b6ab769d823a3cc87e9b4c7a3a6b932f54b58