tentaAug2012
Merge branch 'fixadmaster' of https://github.com/viktorvoigt/sysa14.git