tree 5cf64c97178c4cad0fcafd5f50820bd4539d8b3b
parent 9aa72188ddf718a790bf4e914d3420b3900d9791
parent ea4b76d54a074e89d24c59da6248747507142127
author Simon Butcher <simon.butcher@arm.com> 1442416898 +0100
committer Simon Butcher <simon.butcher@arm.com> 1442416898 +0100

Merge branch 'development' with bugfix branch

Conflicts:
	ChangeLog