Merge branch 'ctrl-mbr'
authorH. Peter Anvin <hpa@zytor.com>
Sat, 4 Apr 2009 22:33:29 +0000 (15:33 -0700)
committerH. Peter Anvin <hpa@zytor.com>
Sat, 4 Apr 2009 22:33:29 +0000 (15:33 -0700)

Trivial merge