merged changeset r4281:4292 on trondeau/ethernet into trunk