AW developing environment III

• cvs conflicts