Merge change Ib1b01007 into eclair

* changes:
  Parse add-on supplied layout devices.