Merged r8195:8205 from jcorgan/ecc into trunk. Adds convolutional encoder