am 421e8d33: (-s ours) am 7f305ce7: (-s ours) Ignore hidden files and vi swap files during packaging. (do not merge)

Merge commit '421e8d3353de606444e5350d8feeee8c01c90394' into eclair-mr2

* commit '421e8d3353de606444e5350d8feeee8c01c90394':
  Ignore hidden files and vi swap files during packaging. (do not merge)