changes from ubuntu10 on Fri Mar 15 14:18:27 EET 2013
Merge branch 'master' of github.com:twintech/tests