Fix up the merge.
Fix up the merge.

svn path=/trunk/dom/; revision=9207

Achal-Aggarwal/libdom,prepare/netsurf_libdom,prepare/netsurf_libdom,dunkelstern/libdom,prepare/netsurf_libdom,dunkelstern/libdom,Achal-Aggarwal/libdom,dunkelstern/libdom,Achal-Aggarwal/libdom,Achal-Aggarwal/libdom,Achal-Aggarwal/libdom,dunkelstern/libdom,prepare/netsurf_libdom,dunkelstern/libdom,dunkelstern/libdom,prepare/netsurf_libdom,Achal-Aggarwal/libdom,prepare/netsurf_libdom