541ed4e resync branches; apply changes for BZ#219236 to all current branches

Authored and Committed by Chris Weyl 17 years ago
    resync branches; apply changes for BZ#219236 to all current branches
    
        
file modified
+44 -2