Import eigen_s and eigen_sx version 2012-06-21
Merge branch 'eigen-k' into develop