Fri Dec  6 23:08:19 EST 2013
Merge branch 'master' of github.com:mhlinder/scientific-computing
Sun Dec  8 16:57:24 EST 2013