2.0-spi-refactoring branch broken

[CDoremus]

Hi,

 

The 2.0-spi-refactoring branch cannot compile without error, which makes applying patches from the trunk a very difficult job. Please correct this when you get a chance.

TIA

/Craig