[hsa] Merged trunk revision 230248 into the hsa branch

[Martin Jambor]

Hi

I have just Merged trunk revision 230248 into the hsa branch.  I will
prepare a new submission for inclusion to trunk tomorrow.

Thanks,

Martin