Merge pull request #3294
c8b7425 setgenerate creates multiple blocks in -regtest mode (Gavin Andresen)