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