cb7c671 Rebase to 20101229

Authored and Committed by Petr Machata 13 years ago
    Rebase to 20101229
    - Resolves: #665985
    - And add bits to .gitignore
    
        
file modified
+3 -0
file modified
+5 -1
file modified
+1 -1