Commit cfe3eb0b8ad671cedd3366c68504fa66601fca4a

Con Kolivas 2012-04-22T10:43:31

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