Merge changes I234b2f09,Ifdca65fc

* changes:
  Fix 4G file transfer on 32 bit.
  Look for glibtoolize if libtoolize is not found.