11a862 backport 2 upstream commits (r10638, r10642)

3 files Authored by jpopelka 11 years ago, Committed by Tim Waugh 11 years ago,
    backport 2 upstream commits (r10638, r10642)
    
        
file added
+24
file added
+40
file modified
+10 -2