0b2b351 Merge remote-tracking branch 'origin/master' into f17

Merged and Committed by dtardon 12 years ago
    Merge remote-tracking branch 'origin/master' into f17
    
        
file modified
+4 -0
file modified
+21 -24
file modified
+4 -4