Merge with 3.2x branch
authorH. Peter Anvin <hpa@zytor.com>
Wed, 13 Sep 2006 04:08:23 +0000 (21:08 -0700)
committerH. Peter Anvin <hpa@zytor.com>
Wed, 13 Sep 2006 04:08:23 +0000 (21:08 -0700)
commit46ac402a1aa14849480db22edb22e22a2dd7465b
treef77da2b4c6b3a86af189abc3a3b60d86f598ec25
parent888a4166d68822eb6fa2712cb9accd3632ac743c
parentc1b0bb65b97cde99e4a7be101fa4033833d17243
Merge with 3.2x branch

Conflicts:

com32/modules/Makefile
com32/modules/Makefile