Merge commit 'cyr/hpa-dat'
authorH. Peter Anvin <hpa@zytor.com>
Fri, 7 Aug 2009 16:16:47 +0000 (09:16 -0700)
committerH. Peter Anvin <hpa@zytor.com>
Fri, 7 Aug 2009 16:16:47 +0000 (09:16 -0700)

Trivial merge