Merge remote-tracking branch 'upstream/master' into feature/norm_assoc_type

src/lib.rs

@@ -88,6 +88,7 @@ Feel free to add your project to this list if you happen to use **nalgebra**!
 extern crate num;
 extern crate rustc_serialize;
 extern crate rand;
+extern crate num;
 
 #[cfg(feature="arbitrary")]
 extern crate quickcheck;

src/traits/structure.rs

@@ -4,6 +4,7 @@ use num::Float;
 use std::{f32, f64, i8, i16, i32, i64, u8, u16, u32, u64, isize, usize};
 use std::slice::{Iter, IterMut};
 use std::ops::{Add, Sub, Mul, Div, Rem, Index, IndexMut};
+use num::Float;
 use traits::operations::{RMul, LMul, Axpy, Transpose, Inv, Absolute};
 use traits::geometry::{Dot, Norm, Orig};