Fix merge error in u12.10-i386

Signed-off-by: Steven Dake <sdake@redhat.com>