Comment out mapTransactions check in deleteTransaction to avoid multiple decalarations, needs permanent fix.
Re-order buildmerkletree rpc call. Comment out pnSeed in namecoin.cpp.
Add auxpow to makefile.unix
Use old IncrementExtraNonce for merged minining compatability.