am 973246de: am c158427e: Merge change 22828 into eclair

Merge commit '973246de432427fbfaf79635a1199ad811e17886'

* commit '973246de432427fbfaf79635a1199ad811e17886':
  Preliminary struct and union support.