am 3fb2d576: am c0446aa9: Merge change I4d2a57bc into eclair-mr2

Merge commit '3fb2d576e9f386ecaa6a2637131c8fac89d05276'

* commit '3fb2d576e9f386ecaa6a2637131c8fac89d05276':
  Moved values into attributes of xml elements where they belong