Merge change I4d2a57bc into eclair-mr2

* changes:
  Moved values into attributes of xml elements where they belong