mapred merge to trunk

[Doug Cutting]

Sami Siren wrote:

+1. I think this is good time to merge now as the mapred is fully usable.

Barring objections, I will do this tomorrow morning, Pacific time.

Doug