am 6ab10a1c: Merge "libdiskconfig: 64-bit issues"

* commit '6ab10a1c17d048e88f929d35293d266b6480f6d6':
  libdiskconfig: 64-bit issues