cdf706e Cherry pick changes from upstream to unbreak some basic functionalities

Authored and Committed by fabbione 15 years ago
    Cherry pick changes from upstream to unbreak some basic functionalities
    
        
file added
+20
file modified
+11 -2