am 15549af0: (-s ours) am af496633: (-s ours) Add save/load for the user-made Layout Devices. (do not merge)

Merge commit '15549af01e6d1d62b56e825800191d223c4f29a2' into eclair-mr2

* commit '15549af01e6d1d62b56e825800191d223c4f29a2':
  Add save/load for the user-made Layout Devices. (do not merge)