am 21ee78b3: am 7b16834a: Merge change Iaf686344 into eclair

Merge commit '21ee78b372ac38f7844b1877192513ca0388fc82'

* commit '21ee78b372ac38f7844b1877192513ca0388fc82':
  dumpstate: Display mtime instead of ctime