Merge branch 'x2apic' into release
Len Brown [Sun, 5 Apr 2009 05:51:51 +0000 (01:51 -0400)]

Trivial merge