Merged rev 215 changes from /branches/xscale-ixp-be into trunk: