Merge commit 'contrib/master'
authorH. Peter Anvin <hpa@zytor.com>
Tue, 29 Dec 2009 00:13:41 +0000 (16:13 -0800)
committerH. Peter Anvin <hpa@zytor.com>
Tue, 29 Dec 2009 00:13:41 +0000 (16:13 -0800)
commitf491a01cbac0ecc7eb072d2caeac2d529091eb9b
tree366c96fe9bf5384384f6bd233206aea3f0af0752
parent16aa8de721413236e9c6c212133b53ceb39887bf
parentcd5188bc5c189b6d374ccd4cd5eeba0d9f718ae1
Merge commit 'contrib/master'