am 5fc3b4ca: am 6ddfaa70: Merge change Ia34f0ca9 into eclair-mr2

Merge commit '5fc3b4ca714fa1371b4b0ea95aa0dbc2d7e1a13d'

* commit '5fc3b4ca714fa1371b4b0ea95aa0dbc2d7e1a13d':
  Fixing database versioning broken for a brief time in CL 32247