Merged r4632:4645 on jcorgan/linking into trunk. Cleans up linking issues with libto...