Merge branch 'master' into core32
authorH. Peter Anvin <hpa@zytor.com>
Fri, 29 May 2009 22:52:02 +0000 (15:52 -0700)
committerH. Peter Anvin <hpa@zytor.com>
Fri, 29 May 2009 22:52:37 +0000 (15:52 -0700)
commit202c6e01db3a245f38ff13c1961cfe881428ee14
tree17744db535bf30fea05816feee9e9b26019c8196
parent19cf98b7a8f2f40b837d55524639e750c12af8c4
parent2f9949c8d0401557c9ca1679fb1d01948fb88b68
Merge branch 'master' into core32

Conflicts:
version

Signed-off-by: H. Peter Anvin <hpa@zytor.com>