merged trondeau/digital-wip2 r4193:4730 into trunk - improves digital receiver and...