Merge branch 'elflink' into elflink-merge
authorH. Peter Anvin <hpa@zytor.com>
Fri, 13 Aug 2010 04:00:22 +0000 (21:00 -0700)
committerH. Peter Anvin <hpa@zytor.com>
Fri, 13 Aug 2010 04:00:22 +0000 (21:00 -0700)

Trivial merge