8bf568f updated tapset to current head

Authored and Committed by Jiri Vanek 10 years ago
    updated tapset to current head
    - few cosmetic changes for more easy merging
    
        
file modified
+27 -11
file modified
+1 -1