Merging from trunk

svn path=/branches/release/libs/numeric/odeint/; revision=84745