K 10
svn:author
V 3
avg
K 8
svn:date
V 27
2010-11-20T16:42:19.431489Z
K 7
svn:log
V 176
fix a mismerge in r215521: MFC imports of ACPICA revisions 20100428
through 20101013

The mismerge resulted in ia64 build breakage.
This is a direct commit.

Pointyhat to:	avg

END