Merge branch 'master' of git://adg.git.sourceforge.net/gitroot/adg/adg