[root]/branches/jarl/HEDTOOLS/tests
merged all latest changes from r11253
144 lines of code changed in 4 files: