Commit 52ce13239647681246b1228dca7d7d95ae0cf960

kanoi 2014-06-27T00:18:43

fix AntS1 breakages from AntS2 changes