Merge commit 'origin/master' into fsc
authorH. Peter Anvin <hpa@zytor.com>
Tue, 22 Dec 2009 23:55:11 +0000 (15:55 -0800)
committerH. Peter Anvin <hpa@zytor.com>
Tue, 22 Dec 2009 23:55:11 +0000 (15:55 -0800)
commit078bd1b56a512c1dac52020d23382c1bdb37056d
tree1d41cd31407195e8610bd6e7be5ccf41c4c3a24b
parentdeaba0fefcfa67b4bf85892cf315458613c130b7
parent40becbadc32e90be6ca40718563a72e36adbce80
Merge commit 'origin/master' into fsc