ca2b0c1 Sync branches, add bugfix patch for later builds.

Authored and Committed by notting 14 years ago
    Sync branches, add bugfix patch for later builds.
    
        
file modified
+13 -2