2496d7a - update to alpha 2

Authored and Committed by Nalin Dahyabhai 12 years ago
    - update to alpha 2
    - drop a couple of patches which were integrated for alpha 2
    
        
file modified
+2 -0
file modified
+9 -12
file modified
+2 -2