e7ade28530
Incorporate some dependancy fixes from John Hay Submitted by: jkh, John Hay<jhay@mikom.csir.co.za>
Incorporate some dependancy fixes from John Hay Submitted by: jkh, John Hay<jhay@mikom.csir.co.za>