Commit 28137c8e10674665438d6fcf59116d9c3193a5e4

Con Kolivas 2013-11-10T20:07:36

Merge branch 'master' into nogpu Conflicts: configure.ac